Scarab commit: svn commit: r10941 - trunk: . src/java/org/tigris/scarab/om src/webapp/WEB-INF/templates/screens src/webapp/WEB-INF/templates/screens/admin

Author: jhoech
Date: 2010-03-01 06:36:27-0800
New Revision: 10941

Modified:
   trunk/   (props changed)
   trunk/properties.xsl   (props changed)
   trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
   trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
   trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
   trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm

Log:
MRG - Merged revision skipped during last merge from b22-release branch, correcting some lines of code manually: 10928.


Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=10941&r1=10940&r2=10941
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2010-03-01 06:36:27-0800
@@ -2138,8 +2138,10 @@
         // Add defaults for issue types and attributes 
         // from parent module
         final Module parentModule = ModuleManager.getInstance(getParentId());
-        inheritFromParent(parentModule);        
-
+        if(parentModule != null && parentModule.getModuleId().intValue() != 0){
+        	inheritFromParent(parentModule);  //don't inherit anything from global data/module
+        }
+        
         final List defaultIssueTypes = IssueTypePeer.getDefaultIssueTypes();
         for (int i=0; i< defaultIssueTypes.size(); i++)
         {

Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&pathrev=10941&r1=10940&r2=10941
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabUser.java	2010-03-01 06:36:27-0800
@@ -383,6 +383,7 @@
     }
 
     /**
+     * Returns all modules which are editable fur user.
      * @see org.tigris.scarab.om.ScarabUser#getEditableModules(Module)
      */
     public List getEditableModules(Module currEditModule)
@@ -391,7 +392,7 @@
         List userModules = getModules(true);
         List editModules = new ArrayList();
 
-        if (currEditModule != null)
+        if (currEditModule != null && currEditModule.getParent().getModuleId().intValue() != 0)
         {
             editModules.add(currEditModule.getParent());
         }
@@ -402,7 +403,7 @@
 
             if (!editModules.contains(module) && parent != currEditModule)
             {
-                if (hasPermission(ScarabSecurity.MODULE__EDIT, module))
+                if (hasPermission(ScarabSecurity.MODULE__EDIT, module) && module.getModuleId().intValue() != 0)
                 {
                     editModules.add(module);
                 }

Modified: trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm?view=diff&pathrev=10941&r1=10940&r2=10941
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/SelectModule.vm	2010-03-01 06:36:27-0800
@@ -19,7 +19,7 @@
 </table>
 
 #set ($canEdit = $scarabR.hasPermission($scarabG.Permission.MODULE__EDIT, $currentModule))
-#if ($canEdit)
+#if ($canEdit && $currentModule.ModuleId != 0)
 <form action="$link.setPage("admin,ModifyModule.vm").addPathInfo("moduleid","$currentModule.ModuleId")" method="post">
 <div class="functnbar2">
   <input type="submit" name="maxumusDorkus" value="$l10n.Edit" />

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm?view=diff&pathrev=10941&r1=10940&r2=10941
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm	2010-03-01 06:36:27-0800
@@ -32,14 +32,10 @@
 <p><em>$l10n.NoModulesToEdit</em></p>
 #end
 
-#if ($data.User.EditableModules.size() > 0)
 <form action="$link.setPage("admin,ModifyModule.vm").addPathInfo("new", "true")" method="post">
 <div class="functnbar2">
 <input type="submit" name="maxumusDorkus" value="$l10n.CreateNew" />
 </div>
 </form>
-#else
-<p><em>$l10n.NoModuleEditPermission</em></p>
-#end
 
 </div>

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm?view=diff&pathrev=10941&r1=10940&r2=10941
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm	2010-03-01 06:36:27-0800
@@ -2,7 +2,7 @@
 #set ($canEdit = "false")
 
 #set ($moduleId = $data.Parameters.getString("moduleid"))
-#if (!$moduleId || $moduleId.length() == 0)
+#if (!$moduleId || $moduleId.length() == 0 || $moduleId == "0")
    #set ($createNew = "true")
 #end
 
@@ -35,12 +35,6 @@
 
   <h3>$title</h3>
 
-  #if ($userModules.size() == 0)
-
-    <p><em>$l10n.NoModuleEditPermission</em></p>
-
-  #else
-
     #* =================================================================
     *  Render the user module editor
     *  =================================================================
@@ -103,10 +97,11 @@
 
             #* PARENT MODULE *#
             <tr>
-              <th>* $l10n.ParentModule</th>
+              <th>$l10n.ParentModule</th>
               <td> 
                 <select name="$moduleGroup.ParentId.Key">
-                  #if ($editModule)
+                  <option value="0">$l10n.Choose</option>
+                  #if ($editModule) 
                     #foreach ($userModule in $userModules)
                       #if ($editModule.Parent.ModuleId.toString().equals($userModule.ModuleId.toString()))
                         <option selected="selected" value="$userModule.ModuleId">[$userModule.Name] $userModule.RealName</option>
@@ -301,6 +296,4 @@
       $intake.declareGroups()
     </form>
 
-  #end
-
 </div>

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2453436