[gatein-commits] gatein SVN: r1124 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.

[do-not-reply at jboss.org]

Author: liem_nguyen
Date: 2009-12-22 04:31:47 -0500 (Tue, 22 Dec 2009)
New Revision: 1124

Modified:
   portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java
   portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
Log:
GTNPORTAL-380 Unknown error when edit Group in special case

Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java	2009-12-22 08:58:58 UTC (rev 1123)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java	2009-12-22 09:31:47 UTC (rev 1124)
@@ -114,6 +114,19 @@
             {
                currentGroup.setLabel(currentGroup.getGroupName());
             }
+            
+            Group updateGroup = service.getGroupHandler().findGroupById(currentGroup.getGroupName());
+            if (updateGroup == null) {
+               Object[] args = {"GroupName", currentGroup.getGroupName()};
+               UIApplication uiApp = event.getRequestContext().getUIApplication();
+               uiApp.addMessage(new ApplicationMessage("UIGroupForm.msg.group-not-exist", args));
+               String parentId = currentGroup.getParentId();
+               uiGroupExplorer.changeGroup(parentId);
+               uiGroupDetail.getChild(UIGroupForm.class).setGroup(null);
+               uiGroupDetail.setRenderedChild(UIGroupInfo.class);
+               return;
+            }
+            
             service.getGroupHandler().saveGroup(currentGroup, false);
             uiGroupForm.reset();
             uiGroupForm.setGroup(null);

Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties	2009-12-22 08:58:58 UTC (rev 1123)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties	2009-12-22 09:31:47 UTC (rev 1124)
@@ -196,7 +196,8 @@
 EditGroup.action.Save=#{word.save}
 EditGroup.action.Back=#{word.cancel}
 
-UIGroupForm.msg.group-exist=This group name is existing, please enter another one!
+UIGroupForm.msg.group-exist=This group name is existing, please enter another one!
+UIGroupForm.msg.group-not-exist=Group "{0}" is not exist or has been deleted.
 ############################################################################
 #   org.exoplatform.portal.component.customization.UIShareNavigationForm   #
 ############################################################################