From 364d1aa72746424b87e1a17823612096db7c3ae3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 9 Mar 2017 19:21:18 +0000 Subject: [PATCH] Use local variables in issues/list partial. git-svn-id: http://svn.redmine.org/redmine/trunk@16386 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/_list.html.erb | 6 +++--- app/views/issues/index.html.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 3ae5e7023..ed97d046f 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -14,7 +14,7 @@ - <% grouped_issue_list(issues, @query, @issue_count_by_group) do |issue, level, group_name, group_count, group_totals| -%> + <% grouped_issue_list(issues, query, issue_count_by_group) do |issue, level, group_name, group_count, group_totals| -%> <% if group_name %> <% reset_cycle %> @@ -30,10 +30,10 @@ <%= check_box_tag("ids[]", issue.id, false, :id => nil) %> <%= raw query.inline_columns.map {|column| "#{column_content(column, issue)}"}.join %> - <% @query.block_columns.each do |column| + <% query.block_columns.each do |column| if (text = column_content(column, issue)) && text.present? -%> - + <% if query.block_columns.count > 1 %> <%= column.caption %> <% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 80210814e..7828075cf 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -16,7 +16,7 @@

<%= l(:label_no_data) %>

<% else %> <%= render_query_totals(@query) %> -<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %> +<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query, :issue_count_by_group => @issue_count_by_group} %> <%= pagination_links_full @issue_pages, @issue_count %> <% end %> -- 2.39.5