Author: truong.le Date: 2009-10-28 06:11:59 -0400 (Wed, 28 Oct 2009) New Revision: 437 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl Log: GTNPORTAL-58: Error after click edit navigation in special case Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-10-28 08:48:06 UTC (rev 436) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-10-28 10:11:59 UTC (rev 437) @@ -56,6 +56,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.UUID; /* * Created by The eXo Platform SAS @@ -90,6 +91,7 @@ UIRepeater repeater = createUIComponent(UIRepeater.class, "UIGroupNavigationGrid", null); virtualList.setUIComponent(repeater); UIPopupWindow editNavigation = addChild(UIPopupWindow.class, null, null); + editNavigation.setId(editNavigation.getId() + "-" + UUID.randomUUID().toString().replaceAll("-", "")); } public void loadNavigations() throws Exception 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 2009-10-28 08:48:06 UTC (rev 436) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-10-28 10:11:59 UTC (rev 437) @@ -60,6 +60,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import java.util.UUID; import javax.servlet.http.HttpServletRequest; @@ -88,6 +89,7 @@ { UIPopupWindow editNavigation = addChild(UIPopupWindow.class, null, null); editNavigation.setWindowSize(400, 400); + editNavigation.setId(editNavigation.getId()+ "-" + UUID.randomUUID().toString().replaceAll("-", "")); //loadPortalConfigs(); } Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl 2009-10-28 08:48:06 UTC (rev 436) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIPopupWindow.gtmpl 2009-10-28 10:11:59 UTC (rev 437) @@ -7,15 +7,19 @@ * version: $Id$ */ %> -<% +<% component = uicomponent.getUIComponent(); boolean showCloseButton = uicomponent.isShowCloseButton() String popupId = uicomponent.getId(); + String rsId = popupId; + if(popupId.indexOf('-')>0){ + rsId = popupId.substring(0,popupId.lastIndexOf('-')); + } def rcontext = _ctx.getRequestContext(); rcontext.getJavascriptManager().importJavascript('eXo.webui.UIPopupWindow'); rcontext.getJavascriptManager().addJavascript("eXo.webui.UIPopupWindow.init('$popupId', $uicomponent.show, $uicomponent.resizable, true, $uicomponent.showMask);"); - String title = popupId; + String title = rsId; if(component != null) title = component.getId(); int width = uicomponent.getWindowWidth(); @@ -41,7 +45,7 @@ <% } else { %> <div class="PopupTitleIconRight"><span></span></div> <% } %> - <div class="PopupTitle"><%=_ctx.appRes(popupId + ".title."+ title)%></div> + <div class="PopupTitle"><%=_ctx.appRes(rsId + ".title."+ title)%></div> </div> </div> </div>