Scarab commit: svn commit: r10164 - branches/release/b21/src/webapp/WEB-INF/templates/viewIssue

Author: hair
Date: 2006-06-11 08:40:52-0700
New Revision: 10164

Modified:
   branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
   branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm

Log:
see thread "adding comments in the comments section yes/no ?" in user list.
 undo of commit 10096 afer some confusion with ISSUE_COMMENT permissions and migration.


Modified: branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm?view=diff&rev=10164&p1=branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10163&r2=10164
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2006-06-11 08:40:52-0700
@@ -5,6 +5,7 @@
   #end

 #end

 

+#set ($canAddComment = $scarabR.hasPermission($scarabG.Permission.ISSUE__COMMENT, $module) && $rmit.Active)

 

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

 <div id='properties'>

@@ -156,7 +157,9 @@
             <th nowrap="nowrap">#if($module.isIssueReasonRequired())#showAsterisk()#end$l10n.ReasonSavedAs</th>

             <td>

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

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

+                #if ($canAddComment)

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

+                #end

                 $l10n.EnterReasonAs

 

               #fieldErrorMsg($attCommentGroup.Data "")


Modified: branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm?view=diff&rev=10164&p1=branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm&r1=10163&r2=10164
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab3.vm	2006-06-11 08:40:52-0700
@@ -22,7 +22,7 @@
 #if ($comments.isEmpty() && !$canAddComment)
   $l10n.NoComments
 #else
-  #if ($canAddComment && !$isEditComments)
+  #if ($canAddComment && !$isEditComments && !$tab.equals("all"))
    <h4>$l10n.EnterComment</h4>
    <table cellspacing="2" cellpadding="3" border="0" width="100%">
      <tr>