jro_apps/redmine Commit - r15260:a00538e602d7

Display the list of saved queries in the sidebar (#14790)....

Jean-Philippe Lang -

r15260:a00538e602d7

parent child

Context file:

r15260:a00538e602d7

app/helpers/queries_helper.rb +10 -5

                 tags
               end
-              def sidebar_queries
+              # Returns the queries that are rendered in the sidebar
-                @sidebar_queries ||= IssueQuery.visible.global_or_on_project(@project).sorted.to_a
+              def sidebar_queries(klass, project)
+                klass.visible.global_or_on_project(@project).sorted.to_a
               end
+              # Renders a group of queries
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                   ) + "\n"
               end
-              def render_sidebar_queries
+              # Renders the list of queries for the sidebar
+              def render_sidebar_queries(klass, project)
+                queries = sidebar_queries(klass, project)
                 out = ''.html_safe
-                out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
+                out << query_links(l(:label_my_queries), queries.select(&:is_private?))
-                out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
+                out << query_links(l(:label_query_plural), queries.reject(&:is_private?))
                 out
               end
             end

app/views/issues/_sidebar.html.erb +1 -1

             <%= call_hook(:view_issues_sidebar_issues_bottom) %>
             <%= call_hook(:view_issues_sidebar_planning_bottom) %>
-            <%= render_sidebar_queries %>
+            <%= render_sidebar_queries(IssueQuery, @project) %>
             <%= call_hook(:view_issues_sidebar_queries_bottom) %>

app/views/timelog/index.html.erb +4 0

             </div>
             <% end %>
+            <% content_for :sidebar do %>
+              <%= render_sidebar_queries(TimeEntryQuery, @project) %>
+            <% end %>
             <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_details)) %>
             <% content_for :header_tags do %>

app/views/timelog/report.html.erb +4 0

             <% end %>
             <% end %>
+            <% content_for :sidebar do %>
+              <%= render_sidebar_queries(TimeEntryQuery, @project) %>
+            <% end %>
             <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_report)) %>

test/functional/timelog_controller_test.rb +1 0

                 get :index, :project_id => 'ecookbook', :query_id => query.id
                 assert_response :success
                 assert_select 'h2', :text => query.name
+                assert_select '#sidebar a.selected', :text => query.name
               end
               def test_index_atom_feed

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages