Author: tan_pham_dinh Date: 2010-03-05 03:45:35 -0500 (Fri, 05 Mar 2010) New Revision: 1999 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java Log: GTNPORTAL-808: Adding new membership with same name than existing one does not trigger "already exists" warnings 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-05 08:35:59 UTC (rev 1998) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java 2010-03-05 08:45:35 UTC (rev 1999) @@ -19,10 +19,10 @@ package org.exoplatform.organization.webui.component; +import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.web.application.ApplicationMessage; -import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIApplication; @@ -90,37 +90,34 @@ MembershipType mt = service.getMembershipTypeHandler().findMembershipType(msTypeName); - if (mt != null) + if (uiForm.getMembershipTypeName() == null) { - MembershipType existMembershipType = service.getMembershipTypeHandler().findMembershipType(mt.getName()); - if (existMembershipType == null) + //For create new membershipType case + if (mt != null) { UIApplication uiApp = event.getRequestContext().getUIApplication(); - uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.MembershipNotExist", new String[]{mt - .getName()})); + uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.SameName", null)); + return; } - else - { - uiForm.invokeSetBindingBean(mt); - service.getMembershipTypeHandler().saveMembershipType(mt, true); - } + mt = service.getMembershipTypeHandler().createMembershipTypeInstance(); + uiForm.invokeSetBindingBean(mt); + service.getMembershipTypeHandler().createMembershipType(mt, true); + uiMembershipManagement.addOptions(mt); } else { - mt = service.getMembershipTypeHandler().createMembershipTypeInstance(); - uiForm.invokeSetBindingBean(mt); - MembershipType existMembershipType = service.getMembershipTypeHandler().findMembershipType(mt.getName()); - - if (existMembershipType != null) + //For edit a membershipType case + if (mt == null) { UIApplication uiApp = event.getRequestContext().getUIApplication(); - uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.SameName", null)); - return; + uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.MembershipNotExist", + new String[]{msTypeName})); } - service.getMembershipTypeHandler().createMembershipType(mt, true); - - // Update the list of membership under GroupManagment if any - uiMembershipManagement.addOptions(mt); + else + { + uiForm.invokeSetBindingBean(mt); + service.getMembershipTypeHandler().saveMembershipType(mt, true); + } } uiMembershipManagement.getChild(UIListMembershipType.class).loadData();