Scarab commit: svn commit: r10570 - trunk/src/webapp/WEB-INF/templates/viewIssue

Author: hair
Date: 2008-05-08 03:40:54-0700
New Revision: 10570

Modified:
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm

Log:
according to Johannes Hoechstaedter's feedback in http://scarab.tigris.org/servlets/BrowseList?list=dev&by=thread&from=653148
 [ Issue SCB2539:  (View versus Edit screen of "Attributes" for logged-in user) ]


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=10570&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10569&r2=10570
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2008-05-08 03:40:54-0700
@@ -131,7 +131,7 @@
     #end

   </div>

  

-  #if ($isEditAttributes || $canAddComment)

+  #if ($isEditAttributes)

     <h4>$l10n.SaveChanges#if($module.isIssueReasonRequired()) #asterisk()#end</h4>

     <div class="axial">

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

@@ -159,16 +159,14 @@
     </div>

    #end

 

-   #if($canEdit || $canAddComment)

+   #if($canEdit)

     <div class="functnbar3">

      #if(!$isEditAttributes)

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

      #end

-     #if($isEditAttributes || $canAddComment)

+     #if($isEditAttributes)

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

-      #if($isEditAttributes)

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

-      #end

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

      #end

     </div>

   #end


Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm?view=diff&rev=10570&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm&r1=10569&r2=10570
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm	2008-05-08 03:40:54-0700
@@ -1,6 +1,7 @@
 #set ($canAddComment = $scarabR.hasPermission($scarabG.Permission.ISSUE__COMMENT, $module) && $rmit.Active)
 #set ($canEditComments = $scarabR.hasPermission($scarabG.Permission.MODULE__EDIT))
 #set ($isEditComments = $canEditComments && $data.Parameters.getBoolean("edit_comments"))
+#set ($isEditAttributes = $canEdit && $data.Parameters.getBoolean("edit_attributes"))
 #set ($comments = $currentIssue.getComments($fullComments.equals("true")))
 
 #macro (commentList)
@@ -22,7 +23,7 @@
 #if ($comments.isEmpty() && !$canAddComment)
   $l10n.NoComments
 #else
-  #if ($canAddComment && !$isEditComments && !$tab.equals("all"))
+  #if ($canAddComment && !$isEditComments && (!$tab.equals("all") || !$isEditAttributes))
    <h4>$l10n.EnterComment</h4>
    <table cellspacing="2" cellpadding="3" border="0" width="100%">
      <tr>