[gatein-commits] gatein SVN: r1967 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.

[do-not-reply at jboss.org]

Author: tan_pham_dinh
Date: 2010-03-04 04:29:40 -0500 (Thu, 04 Mar 2010)
New Revision: 1967

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/UIMembershipTypeForm.java
Log:
- GTNPORTAL-564: Can't delete group or memebershipType which was edited

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	2010-03-04 09:29:25 UTC (rev 1966)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupForm.java	2010-03-04 09:29:40 UTC (rev 1967)
@@ -79,6 +79,7 @@
       }
       else
       {
+         this.groupId = null;
          getUIStringInput(GROUP_NAME).setEditable(UIFormStringInput.ENABLE);
          reset();
       }

Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java	2010-03-04 09:29:25 UTC (rev 1966)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java	2010-03-04 09:29:40 UTC (rev 1967)
@@ -62,6 +62,7 @@
    {
       if (membershipType == null)
       {
+         membershipTypeName = null;
          getUIStringInput(MEMBERSHIP_TYPE_NAME).setEditable(UIFormStringInput.ENABLE);
          return;
       }