Scarab commit: svn commit: r10923 - branches/release/0.22/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm

Author: jhoech
Date: 2010-02-25 01:36:19-0800
New Revision: 10923

Modified:
   branches/release/0.22/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm

Log:
MIS - Last commit reverted, due to incomplete log message.

Modified: branches/release/0.22/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm?view=diff&pathrev=10923&r1=10922&r2=10923
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm	(original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm	2010-02-25 01:36:19-0800
@@ -75,12 +75,15 @@
     #if($status.equals($blockingStatus)) 
 		style="background:#FE9292"
 		## light red
+    #else 
+		style="background:#C0FE92"
+		## light green
     #end
   #end
 #end
 
 ## ===========================================
-## macro relationTable : Displays relationships of one type (blocking (is blocked), blocking (blocks), duplicates, non-blocking) for an issue.
+## macro relationTable : Displays relationships of one type (blocking, duplicates, non-blocking) for an issue.
 ##                       For the related issues the conditions of theses issues can be evaluated additionally. 
 ## ===========================================
 ## $thisIssue : Currently selected issue.
@@ -94,10 +97,6 @@
       #set ($allBlockersDisplayed = true)
       #foreach ($depend in $entries)
 
-		 ## 
-		 ## Evaluate actual blocking status of potential blockers if conditions are defined
-		 ## Actual blockers are shown with red background table row (see below)
-		 ##
          #set ($status="")      
          #if ($indentLevel==0)
            #set ($isDependant=false)
@@ -114,6 +113,9 @@
                #end
              #end
            #end
+           #if ($isDependant==false && !$blockingStatus.equals(""))
+             #set ($status= "Not$blockingStatus")
+           #end
          #end
       
         <tr>
@@ -150,6 +152,13 @@
           </td>
           
           ## -------------------------------------
+          ## The dependency status
+          ## -------------------------------------
+          <td nowrap="nowrap" #addBackground("$blockingStatus" "$status")>
+            #if (!$status.equals(""))$l10n.get($status)#end
+          </td>
+
+          ## -------------------------------------
           ## related Issues IssueId plus Hyperlink
           ## -------------------------------------
           <td nowrap="nowrap" #addBackground("$blockingStatus" "$status")>
@@ -298,6 +307,7 @@
           <th nowrap="nowrap">$l10n.Select</th>
         #end
         <th nowrap="nowrap" >$l10n.DependencyType</th>
+        <th nowrap="nowrap" >$l10n.BlockedStatus</th>
         <th nowrap="nowrap" >$l10n.IssueId</th>     
         <th nowrap="nowrap" >$l10n.Summary</th>
         #foreach ($attr in $additionalDisplayAttributes)

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2451973