diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-03-09 19:21:18 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-03-09 19:21:18 +0000 |
| commit | 364d1aa72746424b87e1a17823612096db7c3ae3 (patch) | |
| tree | 8f3775d4d115979d81af161929c8464b9d3e6e31 | |
| parent | eb0a93d353bd04a82303c8faaefe38493fcd9f9d (diff) | |
| download | redmine-364d1aa72746424b87e1a17823612096db7c3ae3.tar.gz redmine-364d1aa72746424b87e1a17823612096db7c3ae3.zip | |
Use local variables in issues/list partial.
git-svn-id: http://svn.redmine.org/redmine/trunk@16386 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/issues/_list.html.erb | 6 | ||||
| -rw-r--r-- | 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 @@ </tr> </thead> <tbody> - <% 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 %> <tr class="group open"> @@ -30,10 +30,10 @@ <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td> <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %> </tr> - <% @query.block_columns.each do |column| + <% query.block_columns.each do |column| if (text = column_content(column, issue)) && text.present? -%> <tr class="<%= current_cycle %>"> - <td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"> + <td colspan="<%= query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"> <% if query.block_columns.count > 1 %> <span><%= column.caption %></span> <% 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 @@ <p class="nodata"><%= l(:label_no_data) %></p> <% 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} %> <span class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></span> <% end %> |