[Jboss-svn-commits] JBL Code SVN: r4709 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/navigation forge-contributor/src/java/org/jboss/forge/contributor

[<jbo...@li...>]

Author: adamw
Date: 2006-06-09 18:14:34 -0400 (Fri, 09 Jun 2006)
New Revision: 4709

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java
   labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java
Log:
Nav admin fix

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java	2006-06-09 20:32:46 UTC (rev 4708)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Entry.java	2006-06-09 22:14:34 UTC (rev 4709)
@@ -179,9 +179,10 @@
             User user = request.getUser();
 
             if ((user == null) ||
-                    (!user.getRoleNames().contains(permission)))
+                    (!user.getRoleNames().contains(permission))) {
                 // The user doesn't have the given role.
                 return;
+            }
         }
 
         innerFillContext(request, context, currentLink, projectId, levelId);

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java	2006-06-09 20:32:46 UTC (rev 4708)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/Menu.java	2006-06-09 22:14:34 UTC (rev 4709)
@@ -104,7 +104,7 @@
 	public void fillContext(JBossRenderRequest request, DelegateContext context,
                      String currentLink, String projectId, String levelId) {
 		for (Entry e : entries) {
-			e.innerFillContext(request, context, currentLink, projectId, levelId);
+			e.fillContext(request, context, currentLink, projectId, levelId);
         }
     }
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java	2006-06-09 20:32:46 UTC (rev 4708)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java	2006-06-09 22:14:34 UTC (rev 4709)
@@ -32,6 +32,6 @@
 	}
 
 	public boolean isUserLogged() {
-		return ConTools.getRemoteUser() != null;
+        return ConTools.getRemoteUser() != null;
 	}
 }