[gatein-commits] gatein SVN: r7893 - in epp/portal/branches/EPP_5_2_Branch: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.

[do-not-reply at jboss.org]

Author: mwringe
Date: 2011-10-26 11:01:09 -0400 (Wed, 26 Oct 2011)
New Revision: 7893

Modified:
   epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java
   epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
Log:
JBEPP-1220: fix a couple of issues with the extendedmode checkbox not acting as expected.

Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java	2011-10-26 10:53:21 UTC (rev 7892)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java	2011-10-26 15:01:09 UTC (rev 7893)
@@ -174,7 +174,7 @@
          getUIStringInput("name").setEditable(UIFormStringInput.ENABLE);
          getChild(UIFormInputIconSelector.class).setSelectedIcon("Default");
          setShowPublicationDate(false);
-         switchLabelMode(false);
+         switchLabelMode(true);
          return;
       }
       getUIStringInput("name").setEditable(UIFormStringInput.DISABLE);
@@ -392,9 +392,11 @@
       }
       
       node.setI18nizedLabels(labels);
-      
+
       if (getUIFormCheckBoxInput(SWITCH_MODE).getValue().toString().equals("true"))
          node.setLabel(null);
+      else if (node.getLabel() == null)
+         node.setLabel(node.getName());
    }
 
    public void setShowCheckPublicationDate(boolean show)

Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java	2011-10-26 10:53:21 UTC (rev 7892)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java	2011-10-26 15:01:09 UTC (rev 7893)
@@ -56,7 +56,7 @@
       super(name, bindingExpression, null);
       if (value != null)
          typeValue_ = (Class<T>)value.getClass();
-      value_ = value;
+      setValue(value);
       setId(name);
    }