Scarab commit: svn commit: r10285 - branches/release/b21/src: java/org/tigris/scarab/om webapp/WEB-INF/templates/screens

Author: jorgeuriarte
Date: 2006-09-08 09:48:22-0700
New Revision: 10285

Modified:
   branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java
   branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java
   branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm

Log:
Merged revisions 10273 via svnmerge from 
http://scarab.tigris.org/svn/scarab/trunk

........
  r10273 | jorgeuriarte | 2006-08-31 00:37:32 +0200 (Thu, 31 Aug 2006) | 1 line
  
  Fixes SCB1914. Public modules list will now only appear if there's any module other than Global availaible for the anonymous user.
........


Modified: branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java?view=diff&rev=10285&p1=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java&r1=10284&r2=10285
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/ScarabUser.java	2006-09-08 09:48:22-0700
@@ -96,6 +96,13 @@
      * @param currEditModule the module we are currently editing
      */
     List getEditableModules(Module currEditModule) throws TorqueException;
+    
+    /**
+     * Gets all modules the user is associated to, except the Global one.
+     * @return
+     * @throws TorqueException
+     */
+    List getNonGlobalModules() throws TorqueException;
 
     /**
      * Gets an issue stored in the temp hash under key.

Modified: branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&rev=10285&p1=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java&r1=10284&r2=10285
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java	2006-09-08 09:48:22-0700
@@ -648,6 +648,23 @@
     }
     
     /**
+     * @see org.tigris.scarab.om.ScarabUser#getNonGlobalModules()
+     */
+    public List getNonGlobalModules() throws TorqueException
+    {
+        List modules = new ArrayList();
+        for (Iterator it = internalUser.getModules().iterator(); it.hasNext(); )
+        {
+            Module m = (Module)it.next();
+            if (!m.isGlobalModule())
+            {
+                modules.add(m);
+            }
+        }
+        return modules;
+    }
+
+    /**
      * @see org.tigris.scarab.om.ScarabUser#getRModuleUserAttributes(Module, IssueType)
      */
     public List getRModuleUserAttributes(Module module,

Modified: branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm?view=diff&rev=10285&p1=branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm&r1=10284&r2=10285
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/screens/Login.vm	2006-09-08 09:48:22-0700
@@ -91,7 +91,7 @@
 </form>

 

 #if ($scarabR.anonymousLoginAllowed)

-#set ($userModules = $data.User.Modules)

+#set ($userModules = $data.User.NonGlobalModules)

 #if ($userModules.size() > 0 && $scarabG.publicModulesDisplayCount != 0)

 <h3>$l10n.PublicModules</h3>

 <table border="1" cellspacing="2" cellpadding="3" width="100%">