Patch #29830 » 0002-fix-updated.patch
| app/helpers/queries_helper.rb | ||
|---|---|---|
| 421 | 421 |
end |
| 422 | 422 | |
| 423 | 423 |
# Returns the query definition as hidden field tags |
| 424 |
def query_as_hidden_field_tags(query) |
|
| 424 |
def query_as_hidden_field_tags(query, with_block_columns: false)
|
|
| 425 | 425 |
tags = hidden_field_tag("set_filter", "1", :id => nil)
|
| 426 | 426 | |
| 427 | 427 |
if query.filters.present? |
| ... | ... | |
| 435 | 435 |
else |
| 436 | 436 |
tags << hidden_field_tag("f[]", "", :id => nil)
|
| 437 | 437 |
end |
| 438 |
ignored_block_columns = with_block_columns ? [] : query.block_columns.map(&:name) |
|
| 438 | 439 |
query.columns.each do |column| |
| 440 |
next if ignored_block_columns.include? column.name |
|
| 439 | 441 |
tags << hidden_field_tag("c[]", column.name, :id => nil)
|
| 440 | 442 |
end |
| 441 | 443 |
if query.totalable_names.present? |
| app/views/issues/index.html.erb | ||
|---|---|---|
| 42 | 42 |
<div id="csv-export-options" style="display:none;"> |
| 43 | 43 |
<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3> |
| 44 | 44 |
<%= form_tag(_project_issues_path(@project, :format => 'csv'), :method => :get, :id => 'csv-export-form') do %> |
| 45 |
<%= query_as_hidden_field_tags(@query) %> |
|
| 45 |
<%= query_as_hidden_field_tags(@query, with_block_columns: true) %>
|
|
| 46 | 46 |
<%= hidden_field_tag('query_name', @query.name) %>
|
| 47 | 47 |
<p> |
| 48 | 48 |
<label><%= radio_button_tag 'c[]', '', true %> <%= l(:description_selected_columns) %></label><br /> |
- « Previous
- 1
- 2
- Next »