Author: ndkhoiits Date: 2010-04-14 05:18:03 -0400 (Wed, 14 Apr 2010) New Revision: 2623 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java Log: GTNPORTAL-998 - By default, filterNavigation process with accessNodeWithoutPage is false - Filter PageNavigation when add new page as well as editPageNavigation Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-04-14 09:10:12 UTC (rev 2622) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-04-14 09:18:03 UTC (rev 2623) @@ -143,7 +143,7 @@ // Still keep this method to have compatibility with legacy code public static PageNavigation filter(PageNavigation nav, String userName) throws Exception { - return filterNavigation(nav, userName, false, true); + return filterNavigation(nav, userName, false, false); } /** Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-04-14 09:10:12 UTC (rev 2622) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-04-14 09:18:03 UTC (rev 2623) @@ -67,9 +67,11 @@ private void loadNavigations() throws Exception { + WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); PageNavigation portalSelectedNav = Util.getUIPortal().getSelectedNavigation(); if (portalSelectedNav != null) { + portalSelectedNav = PageNavigationUtils.filterNavigation(portalSelectedNav, context.getRemoteUser(), true, true); selectNavigation(portalSelectedNav); PageNode portalSelectedNode = Util.getUIPortal().getSelectedNode(); if (portalSelectedNode != null)