Scarab commit: svn commit: r10928 - branches/release/0.22/src: java/org/tigris/scarab/om webapp/WEB-INF/templates/screens webapp/WEB-INF/templates/screens/admin
Johannes Höchstädter <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jhoech
Date: 2010-02-26 08:22:15-0800
New Revision: 10928
Modified:
branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java
branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java
branches/release/0.22/src/webapp/WEB-INF/templates/screens/SelectModule.vm
branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Log:
FIX - Inheritance from global data/module for new modules is not longer permitted, as this was found buggy and incomplete: 0-Null-inconsistency SCB3019. Instead of this new modules are able to inherit from an empty reference. Global data cannot be inherited by any module. Maybe a default module can follow which represents a module in default data from which e.g. beginners or impatient users are able to inherit their new modules and start working.
Modified: branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=10928&r1=10927&r2=10928
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java (original)
+++ branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabModule.java 2010-02-26 08:22:15-0800
@@ -1293,11 +1293,11 @@
if (optIds.length > 0)
{
- Criteria crit = new Criteria();
- crit.add(RModuleOptionPeer.ISSUE_TYPE_ID, issueType.getIssueTypeId());
- crit.add(RModuleOptionPeer.MODULE_ID, getModuleId());
- crit.addIn(RModuleOptionPeer.OPTION_ID, optIds);
- crit.addAscendingOrderByColumn(RModuleOptionPeer.PREFERRED_ORDER);
+ Criteria crit = new Criteria();
+ crit.add(RModuleOptionPeer.ISSUE_TYPE_ID, issueType.getIssueTypeId());
+ crit.add(RModuleOptionPeer.MODULE_ID, getModuleId());
+ crit.addIn(RModuleOptionPeer.OPTION_ID, optIds);
+ crit.addAscendingOrderByColumn(RModuleOptionPeer.PREFERRED_ORDER);
crit.addAscendingOrderByColumn(RModuleOptionPeer.DISPLAY_VALUE);
rModOpts = getRModuleOptions(crit);
}
@@ -1986,8 +1986,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: branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java?view=diff&pathrev=10928&r1=10927&r2=10928
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java (original)
+++ branches/release/0.22/src/java/org/tigris/scarab/om/AbstractScarabUser.java 2010-02-26 08:22:15-0800
@@ -382,6 +382,7 @@
}
/**
+ * Returns all modules which are editable fur user.
* @see org.tigris.scarab.om.ScarabUser#getEditableModules(Module)
*/
public List getEditableModules(Module currEditModule)
@@ -390,7 +391,7 @@
List userModules = getModules(true);
List editModules = new ArrayList();
- if (currEditModule != null)
+ if (currEditModule != null && currEditModule.getParent().getModuleId().intValue() != 0)
{
editModules.add(currEditModule.getParent());
}
@@ -401,7 +402,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: branches/release/0.22/src/webapp/WEB-INF/templates/screens/SelectModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/screens/SelectModule.vm?view=diff&pathrev=10928&r1=10927&r2=10928
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/screens/SelectModule.vm (original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/screens/SelectModule.vm 2010-02-26 08:22:15-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: branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm?view=diff&pathrev=10928&r1=10927&r2=10928
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm (original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ManageModules.vm 2010-02-26 08:22:15-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: branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm?view=diff&pathrev=10928&r1=10927&r2=10928
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm (original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm 2010-02-26 08:22:15-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
-
<form action="$link.setPage("admin,ModifyModule.vm")" method="post">
<input type="hidden" name="action" value="ModifyModule" />
<input type="hidden" name="$scarabG.Constant.CANCEL_TEMPLATE" value="admin,ManageModules.vm" />
@@ -87,10 +81,11 @@
</tr>
#if ($createNew.equals("true") || $moduleId != "0")
<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>
@@ -243,6 +238,4 @@
$intake.declareGroups()
</form>
-#end
-
</div>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2452602