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

Author: jhoech
Date: 2010-02-25 01:37:38-0800
New Revision: 10924

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

Log:
FIX - Avoid scarab from highlighting every blocking relation by a green background. Additional column for state of blocking relation removed. Code for highlighting relation by a red background according to conditions left unchanged.
  ADD - Some comments added.

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=10924&r1=10923&r2=10924
==============================================================================
--- 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:37:38-0800
@@ -75,15 +75,12 @@
     #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, duplicates, non-blocking) for an issue.
+## macro relationTable : Displays relationships of one type (blocking (is blocked), blocking (blocks), duplicates, non-blocking) for an issue.
 ##                       For the related issues the conditions of theses issues can be evaluated additionally. 
 ## ===========================================
 ## $thisIssue : Currently selected issue.
@@ -97,6 +94,10 @@
       #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)
@@ -113,9 +114,6 @@
                #end
              #end
            #end
-           #if ($isDependant==false && !$blockingStatus.equals(""))
-             #set ($status= "Not$blockingStatus")
-           #end
          #end
       
         <tr>
@@ -152,13 +150,6 @@
           </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")>
@@ -307,7 +298,6 @@
           <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=2451978