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

Author: jhoech
Date: 2010-03-01 05:54:34-0800
New Revision: 10938

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

Log:
MRG - Merged some revisions from b22-release branch starting from last revision of merge: 10914-10924

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm?view=diff&pathrev=10938&r1=10937&r2=10938
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm	2010-03-01 05:54:34-0800
@@ -70,23 +70,36 @@
 ## ===========================================
 #macro (addBackground $blockingStatus $status)
   #if ($status.equals(""))
-    
+    ## use default grey background
   #else
-    #if($status.equals($blockingStatus)) style="background:#FE9292"
-    #else style="background:#C0FE92"
+    #if($status.equals($blockingStatus)) 
+		style="background:#FE9292"
+		## light red
     #end
   #end
 #end
 
 ## ===========================================
-## macro relationTable
+## 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.
+## $indentLevel : Depth of recursion.
+## $entries : Related issues to $thisIssue according to one specific type of relationship.
+## $blockers : Related issues to $thisIssue according to one specific type of relationship and where any condition is matched.
+## $blockingStatus : Blocking state of relationship.
 ## ===========================================
-#macro (relationTable $thisIssue $indentLevel $entries $blockers $blockingStatus)
+#macro (relationTable $thisIssue $indentLevel $entries $blockers $blockingStatus)   
+      
       #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 ($depend.TypeId == 1 && $indentLevel==0)
+         #if ($indentLevel==0)
            #set ($isDependant=false)
            ##depend:$depend.UniqueId 
            #foreach ($bi in $blockers)
@@ -101,9 +114,6 @@
                #end
              #end
            #end
-           #if ($isDependant==false && !$blockingStatus.equals(""))
-             #set ($status= "Not$blockingStatus")
-           #end
          #end
       
         <tr>
@@ -140,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")>
@@ -295,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=2453415