Scarab commit: svn commit: r10694 - trunk/src: conf/classes java/org/tigris/scarab/actions java/org/tigris/scarab/om webapp/WEB-INF/templates/screens/admin webapp/WEB-INF/templates/screens/entry
Hussayn Dabbous <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2009-02-15 13:16:22-0800
New Revision: 10694
Modified:
trunk/src/conf/classes/ScarabBundle_de.properties
trunk/src/conf/classes/ScarabBundle_en.properties
trunk/src/java/org/tigris/scarab/actions/ModifyModule.java
trunk/src/java/org/tigris/scarab/om/GlobalParameter.java
trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm
trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm
Log:
A new feature has been implemented in the moduleEditor.
Now it is possible to hide the "reason field" if it is not required.
For this purpose i have done:
- in GlobalParameter.java: added new global parameter: ISSUE_REASON_HIDDEN
- in ModifyModule.java: added new parameter to storage method
- Added some i18n entries (for english and german locales)
- in ModifyModule.vm: Added new checkmark to define hide/show reason field
- in Wizard3.vm: added control code to show/hide the reason field
This fix is related to SCB2818
Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev694&r1693&r2694
=============================================================================--- trunk/src/conf/classes/ScarabBundle_de.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties 2009-02-15 13:16:22-0800
@@ -1260,8 +1260,13 @@
NoPermissionInParentModule=Ihre Berechtigungen reichen nicht aus, um die Nummer des Eltern-Moduls zu ändern.
ModuleUpdated=Modul aktualisiert.
NewModuleCreated=Neues Modul erstellt!
+RenderEngine = Render Engine
+RenderEngineExplained = Prozessor für die Darstellung von Kommentaren
ReasonFieldRequired = Änderungsgrund ist Pflichtfeld
-ReasonFieldRequiredExplained = Das Feld "Änderungsgrund angeben" bei Ticketänderungen als Pflichtfeld darstellen
+ReasonFieldRequiredExplained = Der Änderungsgrund bei Ticketänderungen ist Pflichtfeld
+ReasonFieldDisabled = Änderungsgrund verbergen
+ReasonFieldDisabledExplained = Das Feld zur Eingabe des Änderungsgrundes wird verborgen
+
## ModifyIssue
ExplanatoryReasonRequiredToModifyAttributes=Zur Änderung der Attribute wird ein erklärender Grund benötigt.
Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&pathrev694&r1693&r2694
=============================================================================--- trunk/src/conf/classes/ScarabBundle_en.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties 2009-02-15 13:16:22-0800
@@ -1335,9 +1335,13 @@
NoPermissionInParentModule=You cannot change the parent module ID because you do not have permissions to edit the parent module.
ModuleUpdated=Module updated.
NewModuleCreated=New module created!
+RenderEngine=Render Engine
+RenderEngineExplained=render engine to be used for comments.
ReasonFieldRequired=Reason-field required
ReasonFieldRequiredExplained=The default value is inherited from the parent module.
-
+ReasonFieldDisabled=Hide Reason-field
+ReasonFieldDisabledExplained=Hide Reason field (only if reason field is not required)
+
## ModifyIssue
ExplanatoryReasonRequiredToModifyAttributes=An explanatory reason is required to modify attributes.
MustModifyAttribute=You need to modify an attribute.
Modified: trunk/src/java/org/tigris/scarab/actions/ModifyModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ModifyModule.java?view=diff&pathrev694&r1693&r2694
=============================================================================--- trunk/src/java/org/tigris/scarab/actions/ModifyModule.java (original)
+++ trunk/src/java/org/tigris/scarab/actions/ModifyModule.java 2009-02-15 13:16:22-0800
@@ -204,27 +204,35 @@
*/
private void updateModuleParameters(RunData data, Module me) throws TorqueException
{
- // Set email overrides
+ ParameterParser pp = data.getParameters();
+
+ // Update email overrides
if (GlobalParameterManager.getBoolean(
GlobalParameter.EMAIL_ALLOW_MODULE_OVERRIDE,me))
{
- ParameterParser pp = data.getParameters();
String name;
for (int i=0; i<EMAIL_PARAMS.length; i++)
{
name = EMAIL_PARAMS[i];
- GlobalParameterManager
- .setBoolean(name, me, pp.getBoolean(name));
+ storeGlobalParameterAsBoolean(name, me, pp);
}
}
- ParameterParser pp = data.getParameters();
+ // update all global module parameters in database
storeGlobalParameter(GlobalParameter.ISSUE_REASON_REQUIRED, me, pp);
+ storeGlobalParameterAsBoolean(GlobalParameter.ISSUE_REASON_HIDDEN, me, pp);
storeGlobalParameter(GlobalParameter.REQUIRED_ROLE_FOR_REQUESTING_ACCESS, me, pp);
storeGlobalParameter(GlobalParameter.COMMENT_RENDER_ENGINE, me, pp);
storeGlobalParameter(GlobalParameter.DEFAULT_REPORT, me, pp);
}
+
+ private void storeGlobalParameterAsBoolean(String name, Module me, ParameterParser pp) throws TorqueException
+ {
+ boolean storageValue = pp.getBoolean(name);
+ GlobalParameterManager
+ .setBoolean(name, me, storageValue);
+ }
/**
* @param me
Modified: trunk/src/java/org/tigris/scarab/om/GlobalParameter.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/GlobalParameter.java?view=diff&pathrev694&r1693&r2694
=============================================================================--- trunk/src/java/org/tigris/scarab/om/GlobalParameter.java (original)
+++ trunk/src/java/org/tigris/scarab/om/GlobalParameter.java 2009-02-15 13:16:22-0800
@@ -72,5 +72,7 @@
"comment-render-engine";
public static final String DEFAULT_REPORT "default-report";
+ public static final String ISSUE_REASON_HIDDEN =
+ "scarab.issue.edit.reason.hidden";
}
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&pathrev694&r1693&r2694
=============================================================================--- trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/ModifyModule.vm 2009-02-15 13:16:22-0800
@@ -21,228 +21,286 @@
#end
#macro (ModifyModuleBar $var)
-<div class="functnbar$var">
-#if ($createNew.equals("true"))
- <input type="submit" name="eventSubmit_doCreate" value="$l10n.Create" />
-#else
- <input type="submit" name="eventSubmit_doUpdate" value="$l10n.Save" />
-#end
- <input type="submit" name="eventSubmit_doCancel" value="$l10n.Cancel" />
-</div>
+ <div class="functnbar$var">
+ #if ($createNew.equals("true"))
+ <input type="submit" name="eventSubmit_doCreate" value="$l10n.Create" />
+ #else
+ <input type="submit" name="eventSubmit_doUpdate" value="$l10n.Save" />
+ #end
+ <input type="submit" name="eventSubmit_doCancel" value="$l10n.Cancel" />
+ </div>
#end
<div id="module" class="app">
-<h3>$title</h3>
-
-#if ($userModules.size() == 0)
-
-<p><em>$l10n.NoModuleEditPermission</em></p>
+ <h3>$title</h3>
-#else
+ #if ($userModules.size() == 0)
-<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" />
-<input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE" value="admin,ManageModules.vm" />
-<input type="hidden" name="$scarabG.Constant.OTHER_TEMPLATE" value="admin,ManageModules.vm" />
-
-#set ($moduleGroup = $intake.Module.Default)
-#if ($createNew.equals("true"))
-<input type="hidden" name="new" value="true" />
-#else
-<input type="hidden" name="new" value="false" />
-<input type="hidden" name="$moduleGroup.Id.Key" value="$moduleId" />
-<input type="hidden" name="moduleid" value="$moduleId" />
-#end
+ <p><em>$l10n.NoModuleEditPermission</em></p>
-#set ($moduleGroup = $intake.Module.mapTo($editModule))
-#if (!$moduleGroup.get("Id").isValid())
-<p><em>$moduleGroup.get("Id").Message</em></p>
-#end
+ #else
-<div class="axial">
- <table cellpadding="3" cellspacing="2" border="1" width="100%">
- <tr>
- <th>* $l10n.ModuleName</th>
- <td>
- <input name="$moduleGroup.RealName.Key" value="$moduleGroup.RealName" type="text" size="25" />
- #fieldErrorMsg($moduleGroup.RealName "")
- </td>
- </tr>
- <tr>
- <th>* $l10n.Description</th>
- <td>
- #textAreaMedium ("$moduleGroup.Description.Key" $moduleGroup.Description)
- #fieldErrorMsg($moduleGroup.Description "")
- </td>
- </tr>
- <tr>
- <th>* $l10n.Code</th>
- <td>
- <!-- $moduleGroup.class.name -->
- <input name="$moduleGroup.Code.Key" value="$moduleGroup.Code" type="text" size="$scarabG.getModuleCodeLengthPadded()" maxlength="$scarabG.getModuleCodeLength()" />
- #fieldErrorMsg($moduleGroup.Code "")
- </td>
- </tr>
-#if ($createNew.equals("true") || $moduleId != "0")
- <tr>
- <th>* $l10n.ParentModule</th>
- <td>
- <select name="$moduleGroup.ParentId.Key">
- #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>
- #else
- <option value="$userModule.ModuleId">[$userModule.Name] $userModule.RealName</option>
- #end
+ #* ================================================================
+ * Render the user module editor
+ * ================================================================
+ *#
+ <form action="$link.setPage("admin,ModifyModule.vm")" method="post" name="modifyModuleForm">
+ <input type="hidden" name="action" value="ModifyModule" />
+ <input type="hidden" name="$scarabG.Constant.CANCEL_TEMPLATE" value="admin,ManageModules.vm" />
+ <input type="hidden" name="$scarabG.Constant.NEXT_TEMPLATE" value="admin,ManageModules.vm" />
+ <input type="hidden" name="$scarabG.Constant.OTHER_TEMPLATE" value="admin,ManageModules.vm" />
+
+ #set ($moduleGroup = $intake.Module.Default)
+
+ #if ($createNew.equals("true"))
+ <input type="hidden" name="new" value="true" />
+ #else
+ <input type="hidden" name="new" value="false" />
+ <input type="hidden" name="$moduleGroup.Id.Key" value="$moduleId" />
+ <input type="hidden" name="moduleid" value="$moduleId" />
#end
- #else
- #foreach ($userModule in $userModules)
- <option value="$userModule.ModuleId">[$userModule.Name] $userModule.RealName</option>
- #end
- #end
- </select>
- #fieldErrorMsg($moduleGroup.ParentId "")
- </td>
- </tr>
-
- <tr>
- <th>$l10n.RoleNeededForViewing</th>
- <td>
- <select name="$scarabG.ParameterName.REQUIRED_ROLE_FOR_REQUESTING_ACCESS">
- #set ($requiredRole = $editModule.RequiredRole.Name)
- <option selected="selected" value="" >$l10n.TransitionsAnyRole</option>
- #foreach ($role in $securityAdmin.Roles)
- <option value="$role.Name" #if ($role.Name == $requiredRole) selected #end>$role.Name</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
-
-##Configuration of default report
- <th>$l10n.DefaultReport</th>
- <td>
- <select name="$scarabG.ParameterName.DEFAULT_REPORT">
-
- #set ($reports = $editModule.getNotDeletedModuleReports())
-
- #set ($defaultReport = $editModule.getDefaultReport())
-
- <option selected="selected" value="" >$l10n.None</option>
-
- #foreach ($report in $reports)
- <option value="$report.ReportId" #if ($report.ReportId == $defaultReport.ReportId) selected #end>$report.Name</option>
+
+ #set ($moduleGroup = $intake.Module.mapTo($editModule))
+ #if (!$moduleGroup.get("Id").isValid())
+ <p><em>$moduleGroup.get("Id").Message</em></p>
#end
- </select>
- </td>
- </tr>
-#end
-#*
- <tr>
- <th>$l10n.URL</th>
- <td>
- <input name="$moduleGroup.Url.Key" value="$moduleGroup.Url" type="text" size="25" />
- #fieldErrorMsg($moduleGroup.Url "")
- </td>
- </tr>
-*#
-
-
- <tr>
- <th>$l10n.ArchiveEmail</th>
- <td>
- <input name="$moduleGroup.ArchiveEmail.Key" value="$moduleGroup.ArchiveEmail" type="text" size="50" />
- #fieldErrorMsg($moduleGroup.ArchiveEmail "")
- </td>
- </tr>
-
-
- #if ($scarabG.Parameter.getBoolean($scarabG.ParameterName.EMAIL_ALLOW_MODULE_OVERRIDE))
-
- <tr>
- <th nowrap="nowrap">$l10n.EmailEnable</th>
- <td>
- #set ($name = $scarabG.ParameterName.EMAIL_ENABLED)
- #if($createNew=="true")
- #set ($selected = $scarabG.Parameter.getBoolean($name))
- #else
- #set ($selected = $scarabG.Parameter.getBoolean($name,$editModule))
- #end
- <input type="checkbox" name="$name" #checked($selected)/>
- $l10n.EmailEnableDescription
- </td>
- </tr>
-
- <tr>
- <th nowrap="nowrap">$l10n.EmailIncludeIssueDetails</th>
- <td>
- #set ($name = $scarabG.ParameterName.EMAIL_INCLUDE_ISSUE_DETAILS)
- #if($createNew=="true")
- #set ($selected = $scarabG.Parameter.getBoolean($name))
- #else
- #set ($selected = $scarabG.Parameter.getBoolean($name,$editModule))
- #end
- <input type="checkbox" name="$name" #checked($selected)/>
- $l10n.EmailIncludeIssueDetailsDescription
- </td>
- </tr>
-
-
- #end
-
- <tr>
- <th nowrap="nowrap">render engine</th>
- <td>
- #set ($name = $scarabG.ParameterName.COMMENT_RENDER_ENGINE)
- #set ($selected = $editModule.commentRenderingEngine)
- <select name="$name">
- <option value="" #if ($selected.equals("")) selected #end>choose...</option>
- <option value="plaintext" #if ($selected.equals("plaintext")) selected #end>plaintext</option>
- <option value="html" #if ($selected.equals("html")) selected #end>html</option>
- <option value="radeox" #if ($selected.equals("radeox")) selected #end>wiki(radeox)</option>
- </select>
- render engine to be used for comments.
- </td>
- </tr>
+
+ <div class="axial">
+ <table cellpadding="3" cellspacing="2" border="1" width="100%">
+
+ #* MODULE NAME *#
+ <tr>
+ <th>* $l10n.ModuleName</th>
+ <td>
+ <input name="$moduleGroup.RealName.Key" value="$moduleGroup.RealName" type="text" size="25" />
+ #fieldErrorMsg($moduleGroup.RealName "")
+ </td>
+ </tr>
+
+ #* DESCRIPTION *#
+ <tr>
+ <th>* $l10n.Description</th>
+ <td>
+ #textAreaMedium ("$moduleGroup.Description.Key" $moduleGroup.Description)
+ #fieldErrorMsg($moduleGroup.Description "")
+ </td>
+ </tr>
+
+ #* MODULE PREFIX *#
+ <tr>
+ <th>* $l10n.Code</th>
+ <td>
+ <!-- $moduleGroup.class.name -->
+ <input name="$moduleGroup.Code.Key" value="$moduleGroup.Code" type="text" size="$scarabG.getModuleCodeLengthPadded()" maxlength="$scarabG.getModuleCodeLength()" />
+ #fieldErrorMsg($moduleGroup.Code "")
+ </td>
+ </tr>
+
+
+ #* PARENT MODULE *#
+ #if ($createNew.equals("true") || $moduleId != "0")
+
+ #* PARENT MODULE *#
+ <tr>
+ <th>* $l10n.ParentModule</th>
+ <td>
+ <select name="$moduleGroup.ParentId.Key">
+ #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>
+ #else
+ <option value="$userModule.ModuleId">[$userModule.Name] $userModule.RealName</option>
+ #end
+ #end
+ #else
+ #foreach ($userModule in $userModules)
+ <option value="$userModule.ModuleId">[$userModule.Name] $userModule.RealName</option>
+ #end
+ #end
+ </select>
+ #fieldErrorMsg($moduleGroup.ParentId "")
+ </td>
+ </tr>
+
+ #* ROLE NEEDED FOR VIEWING *#
+ <tr>
+ <th>$l10n.RoleNeededForViewing</th>
+ <td>
+ <select name="$scarabG.ParameterName.REQUIRED_ROLE_FOR_REQUESTING_ACCESS">
+ #set ($requiredRole = $editModule.RequiredRole.Name)
+ <option selected="selected" value="" >$l10n.TransitionsAnyRole</option>
+ #foreach ($role in $securityAdmin.Roles)
+ <option value="$role.Name" #if ($role.Name == $requiredRole) selected #end>$role.Name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ #* DEFAULT REPORT *#
+ <tr>
+ ##Configuration of default report
+ <th>$l10n.DefaultReport</th>
+ <td>
+ <select name="$scarabG.ParameterName.DEFAULT_REPORT">
+
+ #set ($reports = $editModule.getNotDeletedModuleReports())
+ #set ($defaultReport = $editModule.getDefaultReport())
+
+ <option selected="selected" value="" >$l10n.None</option>
+ #foreach ($report in $reports)
+ <option value="$report.ReportId" #if ($report.ReportId == $defaultReport.ReportId) selected #end>$report.Name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ #end
+
+ #*
+ <tr>
+ <th>$l10n.URL</th>
+ <td>
+ <input name="$moduleGroup.Url.Key" value="$moduleGroup.Url" type="text" size="25" />
+ #fieldErrorMsg($moduleGroup.Url "")
+ </td>
+ </tr>
+ *#
+
+ #* ARCHIVE EMAIL ADDRESS *#
+ <tr>
+ <th>$l10n.ArchiveEmail</th>
+ <td>
+ <input name="$moduleGroup.ArchiveEmail.Key" value="$moduleGroup.ArchiveEmail" type="text" size="50" />
+ #fieldErrorMsg($moduleGroup.ArchiveEmail "")
+ </td>
+ </tr>
+
+
+ #if ($scarabG.Parameter.getBoolean($scarabG.ParameterName.EMAIL_ALLOW_MODULE_OVERRIDE))
+ #* ENABLE EMAIL (checkmark) *#
+ <tr>
+ <th nowrap="nowrap">$l10n.EmailEnable</th>
+ <td>
+ #set ($name = $scarabG.ParameterName.EMAIL_ENABLED)
+ #if($createNew=="true")
+ #set ($selected = $scarabG.Parameter.getBoolean($name))
+ #else
+ #set ($selected = $scarabG.Parameter.getBoolean($name,$editModule))
+ #end
+ <input type="checkbox" name="$name" #checked($selected)/>
+ $l10n.EmailEnableDescription
+ </td>
+ </tr>
+
+ #* EMAIL INCLUDES ISSUE DETAILS *#
+ <tr>
+ <th nowrap="nowrap">$l10n.EmailIncludeIssueDetails</th>
+ <td>
+ #set ($name = $scarabG.ParameterName.EMAIL_INCLUDE_ISSUE_DETAILS)
+ #if($createNew=="true")
+ #set ($selected = $scarabG.Parameter.getBoolean($name))
+ #else
+ #set ($selected = $scarabG.Parameter.getBoolean($name,$editModule))
+ #end
+ <input type="checkbox" name="$name" #checked($selected)/>
+ $l10n.EmailIncludeIssueDetailsDescription
+ </td>
+ </tr>
+
+
+ #end
+
+ #* RENDER ENGINE *#
+ <tr>
+ <th nowrap="nowrap">$l10n.RenderEngine</th>
+ <td>
+ #set ($name = $scarabG.ParameterName.COMMENT_RENDER_ENGINE)
+ #set ($selected = $editModule.commentRenderingEngine)
+ <select name="$name">
+ <option value="" #if ($selected.equals("")) selected #end >choose...</option>
+ <option value="plaintext" #if ($selected.equals("plaintext")) selected #end >plaintext</option>
+ <option value="html" #if ($selected.equals("html")) selected #end >html</option>
+ <option value="radeox" #if ($selected.equals("radeox")) selected #end >wiki(radeox)</option>
+ </select>
+ $l10n.RenderEngineExplained
+ </td>
+ </tr>
- <tr>
- <th nowrap="nowrap">$l10n.ReasonFieldRequired</th>
- <td>
- #set ($name = $scarabG.ParameterName.ISSUE_REASON_REQUIRED)
- #set ($selected = $editModule.isIssueReasonRequired())
- #set ($inherited= $editModule.isIssueReasonRequiredInherited())
- #set ($isGlobal = $editModule.isGlobalModule())
- <select name="$name">
- #if (!$isGlobal)
- <option value="" #if ($inherited) selected #end>$l10n.Default</option>
- #end
- <option value="T" #if (!$inherited && $selected) selected #end>$l10n.Yes</option>
- <option value="F" #if (!$inherited && !$selected) selected #end>$l10n.No</option>
- </select>
- #if (!$isGlobal) $l10n.ReasonFieldRequiredExplained #end
- </td>
- </tr>
-
-
-#if ($editModule || $createNew != "true")
- <tr>
- <th nowrap="nowrap">$l10n.Deleted</th>
- <td>
- #booleanCheckbox($moduleGroup.Deleted)
- </td>
- </tr>
-#end
- </table>
-</div>
+ #* REASON FIELD REQUIRED *#
+ <tr>
-#ModifyModuleBar("2")
+ <script type="text/javascript">
+ <!--
+ function setReasonFieldHidden(selector, checkmarker)
+ {
+ selectedObject = document.getElementById(selector);
+ val = selectedObject.options[selectedObject.selectedIndex].value;
+ cb = document.getElementById(checkmarker);
+ if(val == "F")
+ {
+ cb.disabled�lse;
+ return;
+ }
+ if(cb.checked)
+ {
+ cb.disabled=true;
+ cb.checked�lse;
+ }
+ }
+ // -->
+ </script>
+
+ <th nowrap="nowrap">$l10n.ReasonFieldRequired</th>
+ <td>
+ #set ($name = $scarabG.ParameterName.ISSUE_REASON_REQUIRED)
+ #set ($selected = $editModule.isIssueReasonRequired())
+ #set ($inherited= $editModule.isIssueReasonRequiredInherited())
+ #set ($isGlobal = $editModule.isGlobalModule())
+ <select name="$name" id="issue_reason_required" onchange="setReasonFieldHidden('issue_reason_required', 'issue_reason_hidden')">
+ #if (!$isGlobal)
+ <option value="" #if ($inherited) selected #end>$l10n.Default</option>
+ #end
+ <option value="T" #if (!$inherited && $selected) selected #end>$l10n.Yes</option>
+ <option value="F" #if (!$inherited && !$selected) selected #end>$l10n.No</option>
+ </select>
+ #if (!$isGlobal) $l10n.ReasonFieldRequiredExplained #end
+ </td>
+ </tr>
+
+ #* REASON FIELD DISABLED *#
+ <tr>
+ <th nowrap="nowrap">$l10n.ReasonFieldDisabled</th>
+ <td>
+ #set ($name = $scarabG.ParameterName.ISSUE_REASON_HIDDEN)
+ #if($createNew=="true")
+ #set ($selected = $scarabG.Parameter.getBoolean($name))
+ #else
+ #set ($selected = $scarabG.Parameter.getBoolean($name,$editModule))
+ #end
+ <input type="checkbox" name="$name" id="issue_reason_hidden" #checked($selected) onchange="setReasonFieldHidden('issue_reason_required', 'issue_reason_hidden')"/>
+ $l10n.ReasonFieldDisabledExplained
+ </td>
+ </tr>
+
+ #* MODULE DELETED (checkmark) *#
+ #if ($editModule || $createNew != "true")
+ <tr>
+ <th nowrap="nowrap">$l10n.Deleted</th>
+ <td>
+ #booleanCheckbox($moduleGroup.Deleted)
+ </td>
+ </tr>
+ #end
+
+ </table>
+ </div>
-$intake.declareGroups()
-</form>
+ #ModifyModuleBar("2")
-#end
+ $intake.declareGroups()
+ </form>
+
+ #end
</div>
Modified: trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm?view=diff&pathrev694&r1693&r2694
=============================================================================--- trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/screens/entry/Wizard3.vm 2009-02-15 13:16:22-0800
@@ -95,32 +95,38 @@
<h4>$l10n.SubmitNewIssue</h4>
-<div class="axial">
-<table width="100%" cellpadding="3" cellspacing="2" border="1">
- <tr>
- <th nowrap="nowrap">
-#if (!$module.isIssueReasonRequired())
- #set ($reasonOptional = true)
-#else
- #showAsterisk()
-#end
- $l10n.Reason
- </th>
- <td>
-#set ($intakeAttachment = $intake.Attachment.setKey("_1"))
-#if (!$reasonOptional)
- #fieldErrorMsg($intakeAttachment.Data "")
- <p><small><strong>$l10n.MissedRequired1</strong> $l10n.MissedRequired2</small></p>
-#end
-#textAreaMedium("$intakeAttachment.Data.Key" $intakeAttachment.Data)
-#fieldErrorMsg($intakeAttachment.Data "")
- </td>
- </tr>
-
-#set ($userPref = $data.User.EnterIssueRedirect)
-#if (!$userPref)
- #set ($userPref = 2)
-#end
+#set ($name = $scarabG.ParameterName.ISSUE_REASON_HIDDEN)
+#set ($selected = $scarabG.Parameter.getBoolean($name, $module))
+
+ <div class="axial">
+ <table width="100%" cellpadding="3" cellspacing="2" border="1">
+
+ #if ($selected == false)
+ <tr>
+ <th nowrap="nowrap">
+ #if (!$module.isIssueReasonRequired())
+ #set ($reasonOptional = true)
+ #else
+ #showAsterisk()
+ #end
+ $l10n.Reason
+ </th>
+ <td>
+ #set ($intakeAttachment = $intake.Attachment.setKey("_1"))
+ #if (!$reasonOptional)
+ #fieldErrorMsg($intakeAttachment.Data "")
+ <p><small><strong>$l10n.MissedRequired1</strong> $l10n.MissedRequired2</small></p>
+ #end
+ #textAreaMedium("$intakeAttachment.Data.Key" $intakeAttachment.Data)
+ #fieldErrorMsg($intakeAttachment.Data "")
+ </td>
+ </tr>
+ #end
+
+ #set ($userPref = $data.User.EnterIssueRedirect)
+ #if (!$userPref)
+ #set ($userPref = 2)
+ #end
<tr>
<th width="120">$l10n.AfterSubmit</th>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=1166534