Merge branch 'master' of github.com:openfaces/OpenFaces into 3.0-master

TeamDev-Archive · Jul 17, 2012 · 372b02a · 372b02a
2 parents de2596c + 0b1097e
commit 372b02a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/openFaces/source/org/openfaces/component/OUIInputBase.java b/openFaces/source/org/openfaces/component/OUIInputBase.java
@@ -301,8 +301,8 @@ public void restoreState(FacesContext context, Object state) {
 
     @Override
     public void decode(FacesContext context) {
-        super.decode(context);
         decodeDisabledStateIfNeeded(context);
+        super.decode(context);
     }
 
     private void decodeDisabledStateIfNeeded(FacesContext context) {

diff --git a/openFaces/source/org/openfaces/renderkit/select/SelectBooleanCheckboxRenderer.java b/openFaces/source/org/openfaces/renderkit/select/SelectBooleanCheckboxRenderer.java
@@ -225,6 +225,8 @@ public void decode(FacesContext context, UIComponent component) {
         Rendering.decodeBehaviors(context, component);
 
         SelectBooleanCheckbox checkbox = (SelectBooleanCheckbox) component;
+        if (checkbox.isDisabled())
+            return;
 
         Map<String, String> requestMap = context.getExternalContext().getRequestParameterMap();