Author: ndkhoiits Date: 2011-10-19 01:50:10 -0400 (Wed, 19 Oct 2011) New Revision: 7779 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java Log: GTNPORTAL-2181 Still check Extended label mode after add new node with uncheck Extended label mode Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java 2011-10-19 05:46:34 UTC (rev 7778) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java 2011-10-19 05:50:10 UTC (rev 7779) @@ -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: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-10-19 05:46:34 UTC (rev 7778) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormCheckBoxInput.java 2011-10-19 05:50:10 UTC (rev 7779) @@ -56,7 +56,7 @@ super(name, bindingExpression, null); if (value != null) typeValue_ = (Class<T>)value.getClass(); - value_ = value; + setValue(value); setId(name); } @@ -120,7 +120,6 @@ { if (!isEnable()) return; - if (input != null) { if(input.equals("true")) checked = true;