[gatein-commits] gatein SVN: r5057 - in portal/branches/branch-GTNPORTAL-1643: portlet/web/src/main/webapp/groovy/portal/webui/component and 1 other directories.

[do-not-reply at jboss.org]

Author: ndkhoiits
Date: 2010-11-12 03:26:36 -0500 (Fri, 12 Nov 2010)
New Revision: 5057

Modified:
   portal/branches/branch-GTNPORTAL-1643/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarGroupPortlet.java
   portal/branches/branch-GTNPORTAL-1643/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl
   portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
Log:
GTNPORTAL-1630 Allow display a group navigation which has page reference value but page has been removed already and remove link to node if its page reference value is null

Modified: portal/branches/branch-GTNPORTAL-1643/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarGroupPortlet.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarGroupPortlet.java	2010-11-12 08:17:30 UTC (rev 5056)
+++ portal/branches/branch-GTNPORTAL-1643/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarGroupPortlet.java	2010-11-12 08:26:36 UTC (rev 5057)
@@ -55,7 +55,7 @@
       {
          if (navigation.getOwnerType().equals(PortalConfig.GROUP_TYPE))
          {
-            navigations.add(PageNavigationUtils.filter(navigation, remoteUser));
+            navigations.add(PageNavigationUtils.filterNavigation(navigation, remoteUser, false, true));
          }
       }
       return navigations;

Modified: portal/branches/branch-GTNPORTAL-1643/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl	2010-11-12 08:17:30 UTC (rev 5056)
+++ portal/branches/branch-GTNPORTAL-1643/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl	2010-11-12 08:26:36 UTC (rev 5057)
@@ -95,7 +95,7 @@
 					<div class="MenuItem $tabStyleNavigation">
 						<div class="$arrowIcon" title="$title">
 							<div class="ItemIcon $icon">
-								<a href="$pageURI">$label</a>
+								<a href="#">$label</a>
 							</div>
 						</div>
 			""";

Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java	2010-11-12 08:17:30 UTC (rev 5056)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java	2010-11-12 08:26:36 UTC (rev 5057)
@@ -113,7 +113,7 @@
 
       if (context.getRemoteUser() != null)
       {
-         result.add(PageNavigationUtils.filter(getSelectedNavigation(), context.getRemoteUser()));
+         result.add(PageNavigationUtils.filterNavigation(getSelectedNavigation(), context.getRemoteUser(), false, true));
       }
       else
       {
@@ -121,7 +121,7 @@
          {
             if (!showUserNavigation && nav.getOwnerType().equals("user"))
                continue;
-            result.add(PageNavigationUtils.filter(nav, null));
+            result.add(PageNavigationUtils.filterNavigation(nav, null, false, true));
          }
       }
       return result;