Scarab commit: svn commit: r10602 - trunk/src/webapp/WEB-INF/templates: macros reports screens viewIssue

[email protected]
Newsgroups gmane.comp.java.scarab.cvs
Message-ID <[email protected]> 
Author: hair
Date: 2008-08-12 08:59:11-0700
New Revision: 10602

Modified:
   trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
   trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm
   trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm
   trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
   trunk/src/webapp/WEB-INF/templates/screens/UserList.vm
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm

Log:
Issue SCB2536:  ("Per Module" atribute names are not displayed in issue lists) 
 repeated for UserAttributes displayed in lists and issues. That is, always show the issuetype's _module_ attribute name when applicable (or shared).
 (follow up to r10593)


Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&rev=10602&p1=trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm&p2=trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm&r1=10601&r2=10602
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	2008-08-12 08:59:11-0700
@@ -897,7 +897,8 @@
     #end
      #foreach ($userAttr in $userAttrs)
       #if ($user.hasPermission($userAttr.Permission, $modules))
-       <option value="$userAttr.AttributeId">$userAttr.Name</option>
+       #set($userAttrName = $scarabR.getRModuleAttributeDisplayName($userAttr))
+       <option value="$userAttr.AttributeId">$userAttrName</option>
       #end
      #end
     </select></td>

Modified: trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm?view=diff&rev=10602&p1=trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm&p2=trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm&r1=10601&r2=10602
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/reports/SelectUsers.vm	2008-08-12 08:59:11-0700
@@ -36,7 +36,8 @@
         #if ($attrId.toString().equals($selectUserAttr.AttributeId.toString())) 
             #set ($selected = true)
         #end
-        <option value="$selectUserAttr.AttributeId" #selected($selected)>$selectUserAttr.Name</option>
+        #set($selectUserAttrName = $scarabR.getRModuleAttributeDisplayName($selectUserAttr))
+        <option value="$selectUserAttr.AttributeId" #selected($selected)>$selectUserAttrName</option>
       #end
      #end
        </select></td>

Modified: trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm?view=diff&rev=10602&p1=trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm&r1=10601&r2=10602
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/AssignIssue.vm	2008-08-12 08:59:11-0700
@@ -43,10 +43,12 @@
     <td><select name="asso_user_{$userId}_attr_{$attr.AttributeId}_issue_{$issue.IssueId}">
       #foreach ($selectUserAttr in $userAttrs)
         #set ($selected = $attr.AttributeId.toString().equals($selectUserAttr.AttributeId.toString()))
+        #set ($selectUserAttrName = $module.getRModuleAttribute($selectUserAttr,$issue.issueType).displayValue)
         #if ($user.hasPermission($selectUserAttr.Permission, $module))
-        <option value="$selectUserAttr.AttributeId" #selected($selected)>$selectUserAttr.Name</option>
+            #set ($selectUserAttrName = $module.getRModuleAttribute($selectUserAttr,$issue.issueType).displayValue)
+            <option value="$selectUserAttr.AttributeId" #selected($selected)>$selectUserAttrName</option>
         #elseif ($selected)
-        <option value="$attr.AttributeId" selected="selected">$attr.Name $l10n.ParenDisabled</option>
+            <option value="$attr.AttributeId" selected="selected">$selectUserAttrName $l10n.ParenDisabled</option>
         #end
       #end
       </select>
@@ -150,7 +152,8 @@
  <select name="myself_attribute">
     #foreach ($selectUserAttr in $userAttributes)
       #if ($!data.User.hasPermission($selectUserAttr.Permission, $module))
-      <option value="$selectUserAttr.AttributeId">$selectUserAttr.Name:</option>
+        #set ($selectUserAttrName = $module.getRModuleAttribute($selectUserAttr,$currentIssue.issueType).displayValue)
+        <option value="$selectUserAttr.AttributeId">$selectUserAttrName:</option>
       #end
     #end
  </select> 

Modified: trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm?view=diff&rev=10602&p1=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm&r1=10601&r2=10602
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/IssueList.vm	2008-08-12 08:59:11-0700
@@ -135,7 +135,7 @@
     #else
       #set ($sort = "sortColumn")
       #set ($sortData = $pref.AttributeId)
-      #set ($value = $scarabR.getRModuleUserAttributeDisplayName($pref))
+      #set ($value = $scarabR.getRModuleAttributeDisplayName($pref.attribute))
     #end
     <th>
       #prepIssueListPageLink()

Modified: trunk/src/webapp/WEB-INF/templates/screens/UserList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/UserList.vm?view=diff&rev=10602&p1=trunk/src/webapp/WEB-INF/templates/screens/UserList.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/UserList.vm&r1=10601&r2=10602
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/UserList.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/UserList.vm	2008-08-12 08:59:11-0700
@@ -85,7 +85,8 @@
         #if ($attrId.toString().equals($selectUserAttr.AttributeId.toString())) 
             #set ($selected = true)
         #end
-        <option value="$selectUserAttr.AttributeId" #selected($selected)>$selectUserAttr.Name</option>
+        #set ($selectUserAttrName = $scarabR.getRModuleAttributeDisplayName($selectUserAttr))
+        <option value="$selectUserAttr.AttributeId" #selected($selected)>$selectUserAttrName</option>
       #end
      #end
        </select></td>

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm?view=diff&rev=10602&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm&r1=10601&r2=10602
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab2.vm	2008-08-12 08:59:11-0700
@@ -31,7 +31,7 @@
         #end
       </td>
       <td>$assignedUser.UserName</td>
-      <td>$scarabR.getAttribute($attVal.AttributeId).Name </td>
+      <td>$attVal.rModuleAttribute.displayValue </td>
       </tr>
     #end
 
@@ -46,7 +46,8 @@
         <td><input type="text" name="add_user" value="" /></td>
         <td><select name="user_attr_id" size="">
           #foreach ($selectUserAttr in $module.getUserAttributes($currentIssue.issueType))
-            <option value="$selectUserAttr.AttributeId">$selectUserAttr.Name:</option>
+            #set ($selectUserAttrName = $module.getRModuleAttribute($selectUserAttr,$currentIssue.issueType).displayValue)
+            <option value="$selectUserAttr.AttributeId">$selectUserAttrName:</option>
           #end
           </select>
         </td>
@@ -65,7 +66,8 @@
     <select name="myself_attribute">
      #foreach ($selectUserAttr in $module.getUserAttributes($currentIssue.issueType))
       #if ($!data.User.hasPermission($selectUserAttr.Permission, $module))
-        <option value="$selectUserAttr.AttributeId">$selectUserAttr.Name:</option>
+        #set ($selectUserAttrName = $module.getRModuleAttribute($selectUserAttr,$currentIssue.issueType).displayValue)
+        <option value="$selectUserAttr.AttributeId">$selectUserAttrName:</option>
       #end
      #end
     </select>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.