Index: app/helpers/issues_helper.rb
===================================================================
--- app/helpers/issues_helper.rb (revision 1927)
+++ app/helpers/issues_helper.rb (working copy)
@@ -32,20 +32,43 @@
"#{@cached_label_assigned_to}: #{issue.assigned_to}
" +
"#{@cached_label_priority}: #{issue.priority.name}"
end
+
+ def sidebar_queries_custom(visible)
+ # Project specific queries and global queries
+ visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
+ @sidebar_queries_custom = Query.find(:all,
+ :order => "name ASC",
+ :conditions => visible.conditions)
+ @sidebar_queries_custom
+ end
def sidebar_queries
unless @sidebar_queries
# User can see public queries and his own queries
visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
- # Project specific queries and global queries
- visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
- @sidebar_queries = Query.find(:all,
- :order => "name ASC",
- :conditions => visible.conditions)
+ @sidebar_queries = sidebar_queries_custom(visible)
end
@sidebar_queries
end
+ def sidebar_queries_public
+ unless @sidebar_queries_public
+ # User can see public queries
+ visible = ARCondition.new(["is_public = ?", true])
+ @sidebar_queries_public = sidebar_queries_custom(visible)
+ end
+ @sidebar_queries_public
+ end
+
+ def sidebar_queries_private
+ unless @sidebar_queries_private
+ # User can see private queries
+ visible = ARCondition.new(["is_public = ? AND user_id = ?", false, (User.current.logged? ? User.current.id : 0)])
+ @sidebar_queries_private = sidebar_queries_custom(visible)
+ end
+ @sidebar_queries_private
+ end
+
def show_detail(detail, no_html=false)
case detail.property
when 'attr'
Index: app/views/issues/_sidebar.rhtml
===================================================================
--- app/views/issues/_sidebar.rhtml (revision 1927)
+++ app/views/issues/_sidebar.rhtml (working copy)
@@ -15,10 +15,16 @@
<% end %>
-<% unless sidebar_queries.empty? -%>