Scarab commit: svn commit: r10754 - trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm

Author: dabbous
Date: 2009-06-06 03:39:01-0700
New Revision: 10754

Modified:
   trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm

Log:
SCB2955: fixed permission evaluation. queries did only appear if user had edit permission, where read permission was sufficient

Modified: trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm?view=diff&pathrev=10754&r1=10753&r2=10754
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	2009-06-06 03:39:01-0700
@@ -99,15 +99,13 @@
   <div class="body">
 
     #if (!$module.isGlobalModule())
-     #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__SEARCH, $module))
+      #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__SEARCH, $module))
 
-       <div style="font-weight:bold;">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("$l10n.EditPrivateQueries ...")</div>
+        <div style="font-weight:bold;">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("$l10n.EditPrivateQueries ...")</div>
        
-       #set ($queries = $scarabR.UserAllQueries)
-       #set ($counter = 0 )
-       #foreach ($query in $queries)
-         #set ($canEdit   = $query.canEdit($user))
-         #if ($canEdit)
+        #set ($queries = $scarabR.UserAllQueries)
+        #set ($counter = 0 )
+        #foreach ($query in $queries)
           #set ($counter = $counter + 1 )
           #if ($counter > 7 )
             <div class="sublist">$link.addPathInfo("go","privateQueries").setPage("QueryList.vm").setLabel("...")</div>
@@ -115,16 +113,13 @@
           #else
             <div class="sublist"><a href="$scarabR.getExecuteLink($link.setPage("IssueList.vm").toString(), $query)">$query.Name</a></div>
           #end
-         #end
-       #end
+        #end
        
-       <div style="font-weight:bold;">$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("$l10n.EditPublicQueries ...")</div>
+        <div style="font-weight:bold;">$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("$l10n.EditPublicQueries ...")</div>
 
-       #set ($queries = $scarabR.GlobalQueries)
-       #set ($counter = 0 )
-       #foreach ($query in $queries)
-         #set ($canEdit   = $query.canEdit($user))
-         #if ($canEdit)
+        #set ($queries = $scarabR.GlobalQueries)
+        #set ($counter = 0 )
+        #foreach ($query in $queries)
           #set ($counter = $counter + 1 )
           #if ($counter > 7 )
             <div class="sublist">$link.addPathInfo("go","publicQueries").setPage("QueryList.vm").setLabel("...")</div>
@@ -132,11 +127,8 @@
           #else
             <div class="sublist"><a href="$scarabR.getExecuteLink($link.setPage("IssueList.vm").toString(), $query)">$query.Name</a></div>
           #end
-         #end
-       #end
-      
-     #end
-     
+        #end 
+      #end 
     #end
   
   </div>

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