Author: hoang_to Date: 2010-06-17 08:13:45 -0400 (Thu, 17 Jun 2010) New Revision: 3364 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java Log: GTNPORTAL-1300: 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 2010-06-17 12:03:17 UTC (rev 3363) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-06-17 12:13:45 UTC (rev 3364) @@ -335,15 +335,16 @@ } uicomp.navigations.remove(navigation); - // remove navigation from UIPortal - UIPortal uiPortal = Util.getUIPortal(); - removeNavigationByID(uiPortal.getNavigations(), navigation); - + // remove navigation from UIPortalApplication + UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); + removeNavigationByID(uiPortalApp.getUserPortalConfig().getNavigations(), navigation); + removeNavigationByID(uiPortalApp.getNavigations(), navigation); + + service.remove(navigation); event.getRequestContext().addUIComponentToUpdateByAjax(uicomp); //Update UserToolbarGroupPortlet - UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChild(UIWorkingWorkspace.class); uiWorkingWS.updatePortletsByName("UserToolbarGroupPortlet"); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java 2010-06-17 12:03:17 UTC (rev 3363) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java 2010-06-17 12:13:45 UTC (rev 3364) @@ -23,6 +23,7 @@ import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.UserACL; +import org.exoplatform.portal.config.UserPortalConfig; import org.exoplatform.portal.config.UserPortalConfigService; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; @@ -156,10 +157,10 @@ // create navigation for group dataService.create(pageNav); - // add navigation to UIPortal 's navigations - UIPortal uiPortal = Util.getUIPortal(); - uiPortal.getNavigations().add(pageNav); //TODO: Reorder the list in term of navigation priority - + uiPortalApp.getUserPortalConfig().getNavigations().add(0, pageNav); + uiPortalApp.getNavigations().add(0, pageNav); + uiPortalApp.localizeNavigations(); + //Update group navigation list ctx.addUIComponentToUpdateByAjax(uicomp);