commit 22ff2faf4516650eb1239c7e63665dada4aec1a4
author Rainer Döbele <doebele@apache.org> Thu Oct 31 16:36:09 2019 +0100
committer Rainer Döbele <doebele@apache.org> Thu Oct 31 16:36:09 2019 +0100
tree 69676bec61e39198fab5db57fde52f5c5da7217f
parent 2477610325277916752c74a6f76c3d09297b8f24

EMPIREDB-316
bugfix disabled attribute

empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java

diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
index b4c719e..70fae41 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/SelectInputControl.java
@@ -128,11 +128,12 @@
         {   // already has an empty option

             return false;

         }

+        // check required

         if (!ii.isRequired())

-        {   // check disabled and column

+        {   // check column

             Column column = ii.getColumn(); 

-            if (!(ii.isDisabled() && (column==null || ii.getColumn().isRequired())))

-            {

+            if (column==null || !column.isRequired())

+            {   // add empty entry

                 return true;

             }

         }

empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java

diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index 6b40bea..74386ea 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -336,7 +336,12 @@
         @Override

         public boolean isDisabled()

         {

-            return isReadOnly();

+            // check attribute

+            Object val = getAttributeValueEx("disabled");

+            if (val != null && ObjectUtils.getBoolean(val))

+                return true;

+            // not disabeld

+            return false;

         }

 

         @Override

@@ -831,10 +836,6 @@
 

     public boolean isReadOnly()

     {

-        // check attribute

-        Object val = getAttributeValueEx("disabled");

-        if (val != null && ObjectUtils.getBoolean(val))

-            return true;

         // Check Record

         if (isRecordReadOnly())

             return true;