Splits private/public issue queries in the sidebar (#1067).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-21 13:34:33 +00:00 · 2011-02-21 13:34:33 +00:00 · 886c3e295b
parent 0e39c0e550
commit 886c3e295b
45 changed files with 61 additions and 8 deletions
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@ -106,13 +106,29 @@ module IssuesHelper
      # 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, 
-                                    :select => 'id, name',
+                                    :select => 'id, name, is_public',
                                    :order => "name ASC",
                                    :conditions => visible.conditions)
    end
    @sidebar_queries
  end

+  def query_links(title, queries)
+    content_tag('h3', title) +
+      queries.collect {|query|
+          link_to(h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query)
+        }.join('<br />')
+  end
+  
+  def render_sidebar_queries
+    out = ''
+    queries = sidebar_queries.select {|q| !q.is_public?}
+    out << query_links(l(:label_my_queries), queries) if queries.any?
+    queries = sidebar_queries.select {|q| q.is_public?}
+    out << query_links(l(:label_query_plural), queries) if queries.any?
+    out
+  end
+
  def show_detail(detail, no_html=false)
    case detail.property
    when 'attr'
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@ -13,11 +13,5 @@
 <% end %>
 <%= call_hook(:view_issues_sidebar_planning_bottom) %>

-<% unless sidebar_queries.empty? -%>
-<h3><%= l(:label_query_plural) %></h3>
-
-<% sidebar_queries.each do |query| -%>
-<%= link_to(h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query) %><br />
-<% end -%>
+<%= render_sidebar_queries %>
 <%= call_hook(:view_issues_sidebar_queries_bottom) %>
-<% end -%>
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@ -945,3 +945,4 @@ bg:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@ -959,3 +959,4 @@ bs:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -948,3 +948,4 @@ ca:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -1169,3 +1169,4 @@ cs:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@ -961,3 +961,4 @@ da:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -962,3 +962,4 @@ de:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -945,3 +945,4 @@ el:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -595,6 +595,7 @@ en:
  label_query: Custom query
  label_query_plural: Custom queries
  label_query_new: New query
+  label_my_queries: My custom queries
  label_filter_add: Add filter
  label_filter_plural: Filters
  label_equals: is
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -982,3 +982,4 @@ es:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@ -949,3 +949,4 @@ eu:
  setting_commit_logtime_enabled: "Erregistrutako denbora gaitu"
  notice_gantt_chart_truncated: Grafikoa moztu da bistara daitekeen elementuen kopuru maximoa gainditu delako (%{max})
  setting_gantt_items_limit: "Gantt grafikoan bistara daitekeen elementu kopuru maximoa"
+  label_my_queries: My custom queries
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@ -941,3 +941,4 @@ fa:
  text_tip_issue_begin_end_day: issue beginning and ending this day
  text_tip_issue_end_day: issue ending this day
  text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
+  label_my_queries: My custom queries
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -966,3 +966,4 @@ fi:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -596,6 +596,7 @@ fr:
  label_query: Rapport personnalisé
  label_query_plural: Rapports personnalisés
  label_query_new: Nouveau rapport
+  label_my_queries: Mes rapports personnalisés
  label_filter_add: "Ajouter le filtre "
  label_filter_plural: Filtres
  label_equals: égal
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -957,3 +957,4 @@ gl:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -950,3 +950,4 @@ he:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@ -952,3 +952,4 @@ hr:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -964,3 +964,4 @@
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@ -953,3 +953,4 @@ id:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -946,3 +946,4 @@ it:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -966,3 +966,4 @@ ja:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -997,3 +997,4 @@ ko:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@ -1005,3 +1005,4 @@ lt:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -940,3 +940,4 @@ lv:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@ -945,3 +945,4 @@ mk:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@ -946,3 +946,4 @@ mn:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -927,3 +927,4 @@ nl:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@ -932,3 +932,4 @@
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -962,3 +962,4 @@ pl:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -965,3 +965,4 @@ pt-BR:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@ -949,3 +949,4 @@ pt:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@ -938,3 +938,4 @@ ro:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -1058,3 +1058,4 @@ ru:
  label_cvs_path: CVSROOT
  label_git_path: Путь к каталогу .git
  label_mercurial_path: Каталог
+  label_my_queries: My custom queries
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -940,3 +940,4 @@ sk:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@ -941,3 +941,4 @@ sl:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@ -945,3 +945,4 @@ sr-YU:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@ -946,3 +946,4 @@ sr:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@ -986,3 +986,4 @@ sv:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@ -942,3 +942,4 @@ th:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -964,3 +964,4 @@ tr:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@ -941,3 +941,4 @@ uk:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -996,3 +996,4 @@ vi:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -1026,3 +1026,4 @@
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -959,3 +959,4 @@ zh:
  label_cvs_path: CVSROOT
  label_git_path: Path to .git directory
  label_mercurial_path: Root directory
+  label_my_queries: My custom queries