Author: hoang_to Date: 2010-04-28 06:50:12 -0400 (Wed, 28 Apr 2010) New Revision: 2868 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java Log: GTNPORTAL-1091: Refactor method and change access modifier Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-28 10:36:57 UTC (rev 2867) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-28 10:50:12 UTC (rev 2868) @@ -191,14 +191,12 @@ selectedNavigation = navigation; } - public boolean isExistInPageList(String portalName) throws Exception { + private boolean stillKeptInPageList(String portalName) throws Exception { List<PortalConfig> portals = this.getPortalConfigs(); - for(PortalConfig p : portals) { if(p.getName().equals(portalName)) return true; } - return false; } @@ -208,14 +206,7 @@ { UISiteManagement uicomp = event.getSource(); String portalName = event.getRequestContext().getRequestParameter(OBJECTID); - - //TODO nguyenanhkien2a(a)gmail.com (GTNPORTAL-1079) - //We should check portal is existing in current UI to ensure exactly request of Delete action, not be of Refresh(F5) or Malware - if(!uicomp.isExistInPageList(portalName)) - { - return; - } - + UserPortalConfigService service = event.getSource().getApplicationComponent(UserPortalConfigService.class); String defaultPortalName = service.getDefaultPortal(); @@ -242,9 +233,12 @@ } else { - uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist", - new String[]{portalName})); - return; + if (uicomp.stillKeptInPageList(portalName)) + { + uiPortalApp.addMessage(new ApplicationMessage("UISiteManagement.msg.portal-not-exist", + new String[]{portalName})); + return; + } } if (config == null && !Util.getUIPortal().getName().equals(portalName))