Scarab commit: svn commit: r10557 - trunk/src: java/org/tigris/scarab/actions webapp/WEB-INF/templates/viewIssue

Author: hair
Date: 2008-05-05 08:32:27-0700
New Revision: 10557

Modified:
   trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm

Log:
Issue SCB2539:  (View versus Edit screen of "Attributes" for logged-in user)

Modified: trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&rev=10557&p1=trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java&p2=trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java&r1=10556&r2=10557
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/ModifyIssue.java	2008-05-05 08:32:27-0700
@@ -560,6 +560,36 @@
     }
 
     /**
+     * Enable edition mode for the attributes page.
+     */
+    public void doEditattributespage(RunData data, TemplateContext context)
+         throws Exception
+    {
+        if (isCollision(data, context)) 
+        {
+            return;
+        }
+        ScarabUser user = (ScarabUser)data.getUser();
+        ScarabRequestTool scarabR = getScarabRequestTool(context);
+        Issue issue = scarabR.getIssue();
+        if (issue == null)
+        {
+            // no need to set the message here as
+            // it is done in scarabR.getIssue()
+            return;
+        }
+        if (!user.hasPermission(ScarabSecurity.ISSUE__EDIT, 
+                               issue.getModule()))
+        {
+            scarabR.setAlertMessage(NO_PERMISSION_MESSAGE);
+            return;
+        }
+        data.getParameters().add("edit_attributes", "true");
+        data.getParameters().add("fullcomments", data.getParameters().get("fullcomments"));
+        return;
+    }
+    
+    /**
      *  Adds an attachment of type "comment".
      */
     public void doSubmitcomment (RunData data, TemplateContext context) 

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm?view=diff&rev=10557&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10556&r2=10557
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2008-05-05 08:32:27-0700
@@ -1,4 +1,5 @@
 #set ($canAddComment = $scarabR.hasPermission($scarabG.Permission.ISSUE__COMMENT, $module) && $rmit.Active)

+#set ($isEditAttributes = $canEdit && $data.Parameters.getBoolean("edit_attributes"))

 

 <h3 onClick=smartToggleVisibility('properties')><img name="properties.state" src="$staticLink.setPath($iconCollapse)"/>$l10n.IssueAttributesNavi</h3>

 <div id='properties'>

@@ -55,7 +56,7 @@
               #else

                 #set ($field = "Value")

               #end

-              #if ($canEdit)

+              #if ($isEditAttributes)

                 <tr>

                   <th> #if ($rma.getRequired()) #showAsterisk() #end $rma.DisplayValue</th>

                   <td>

@@ -138,7 +139,7 @@
     #end

   </div>

  

-  #if ($canEdit)

+  #if ($isEditAttributes || $canAddComment)

     <h4>$l10n.SaveChanges #asterisk()</h4>

     <div class="axial">

       #set ($attCommentGroup = $intake.Attachment.setKey("attCommentKey$currentIssue.QueryKey"))

@@ -147,9 +148,13 @@
         <tr>

             <th nowrap="nowrap">#if($module.isIssueReasonRequired())#showAsterisk()#end$l10n.ReasonSavedAs</th>

             <td>

-                <input type="radio" name="saveReasonAs" value="history" checked="checked"> $l10n.History</input>

-                #if ($canAddComment)

-                    <input type="radio" name="saveReasonAs" value="comment" > $l10n.Comment </input>

+                #if ($isEditAttributes)

+                    <input type="radio" name="saveReasonAs" value="history" checked="checked"> $l10n.History</input>

+                    #if ($canAddComment)

+                        <input type="radio" name="saveReasonAs" value="comment" > $l10n.Comment </input>

+                    #end

+                #else

+                    <input type="radio" name="saveReasonAs" value="comment" checked="checked"> $l10n.Comment </input>

                 #end

                 $l10n.EnterReasonAs

 

@@ -160,9 +165,16 @@
         </tr>

       </table>

     </div>

+   #end

 

+   #if($canEdit)

     <div class="functnbar3">

+     #if(!$isEditAttributes)

+        <input type="submit" value="$l10n.Edit" name="eventSubmit_doEditattributespage" />

+     #elseif($isEditAttributes || $canAddComment)

       <input type="submit" value="$l10n.Done" name="eventSubmit_doSubmitattributes" />

+      <input type="submit" value="$l10n.Cancel" name="eventSubmit_doCancel" />

+     #end

     </div>

   #end