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

Author: ronvoe122
Date: 2006-11-08 08:40:38-0800
New Revision: 10341

Modified:
   trunk/   (props changed)
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm

Log:
Merged revisions 10317 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10317 | ronvoe122 | 2006-10-31 19:21:22 +0100 (Di, 31 Okt 2006) | 2 lines
  
  [SCB1562] Fixed another place where $link was prepared, but not used afterwards.
  This resulted in a broke link when $link was used the next time.
........


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=10341&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm&r1=10340&r2=10341
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab1.vm	2006-11-08 08:40:38-0800
@@ -1,10 +1,3 @@
-#macro (initializeTabLink)

-  #set ($tabLink = $link.setPage("ViewIssue.vm").addPathInfo("id", "$currentIssue.UniqueId").addPathInfo("eventSubmit_doSetissueview", "foo").setAction("ViewIssue"))

-  #foreach ($prevNextId in $prevNextList)

-    #set ($dummy = $tabLink.addPathInfo("issueList", $prevNextId))

-  #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>

@@ -17,7 +10,6 @@
         <th>$l10n.IssueId</th>

         <td width="25%"><b>$currentIssue.UniqueId ($currentIssue.RModuleIssueType.DisplayName)</b></td>

         <td width="*">

-          #initializeTabLink()

           #if ($currentIssue.isBlocked())

             &nbsp;&nbsp;<a class="blockedmark" STYLE="text-decoration: none" title="$l10n.IssueCurrentlyBlocked" href='$tabLink.addPathInfo("tab", "6")'>$l10n.BlockedWarning</a>  

           #end