Scarab commit: svn commit: r10456 - trunk/src/java/org/tigris/scarab/util/ScarabLink.java

Author: hair
Date: 2007-08-31 11:34:04-0700
New Revision: 10456

Modified:
   trunk/src/java/org/tigris/scarab/util/ScarabLink.java

Log:
http://scarab.tigris.org/servlets/ReadMsg?list=dev&msgNo=14082
>  So i'm going to fix ScarabLink.isAllowed so that Domain__* permissions 
> are always checked against the global module.

Modified: trunk/src/java/org/tigris/scarab/util/ScarabLink.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/ScarabLink.java?view=diff&rev=10456&p1=trunk/src/java/org/tigris/scarab/util/ScarabLink.java&p2=trunk/src/java/org/tigris/scarab/util/ScarabLink.java&r1=10455&r2=10456
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/ScarabLink.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/ScarabLink.java	2007-08-31 11:34:04-0700
@@ -601,9 +601,13 @@
                     }
                 }
                 ScarabUser user = (ScarabUser)data.getUser();
-                allowed = currentModule != null 
+                final Module moduleToCheckAgainst = perm.startsWith("Domain__")
+                        ? currentModule
+                        : ModuleManager.getInstance(Module.ROOT_ID);
+                
+                allowed = moduleToCheckAgainst != null 
                           && (user.hasLoggedIn() || user.isUserAnonymous() )
-                          && user.hasPermission(perm, currentModule);
+                          && user.hasPermission(perm, moduleToCheckAgainst);
             }
             else 
             {