diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-15 18:12:27 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-10-15 18:12:27 +0000 |
| commit | f97d23b1b7eda8a3b3ef19cec471805a6d530665 (patch) | |
| tree | 1770527934eeff2865270ddf87bd864b9751b4bc /app | |
| parent | 91d5465162b077461f4f4f3b75220de8ca0fc319 (diff) | |
| download | redmine-f97d23b1b7eda8a3b3ef19cec471805a6d530665.tar.gz redmine-f97d23b1b7eda8a3b3ef19cec471805a6d530665.zip | |
Isolates csv options for a hash param (#1159).
git-svn-id: http://svn.redmine.org/redmine/trunk@14674 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/issues_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/queries_helper.rb | 1 | ||||
| -rw-r--r-- | app/views/issues/index.html.erb | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 4238215eb..e8e1e3c05 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -79,7 +79,7 @@ class IssuesController < ApplicationController Issue.load_visible_relations(@issues) if include_in_api_response?('relations') } format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") } - format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') } + format.csv { send_data(query_to_csv(@issues, @query, params[:csv]), :type => 'text/csv; header=present', :filename => 'issues.csv') } format.pdf { send_file_headers! :type => 'application/pdf', :filename => 'issues.pdf' } end else diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index f817265dd..865b950f8 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -184,6 +184,7 @@ module QueriesHelper end def query_to_csv(items, query, options={}) + options ||= {} columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns) query.available_block_columns.each do |column| if options[column.name].present? diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index f08f76d65..de87c5ee2 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -79,11 +79,11 @@ <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3> <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %> <p> - <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br /> - <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label> + <label><%= radio_button_tag 'csv[columns]', '', true %> <%= l(:description_selected_columns) %></label><br /> + <label><%= radio_button_tag 'csv[columns]', 'all' %> <%= l(:description_all_columns) %></label> </p> <p> - <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label> + <label><%= check_box_tag 'csv[description]', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label> </p> <% if @issue_count > Setting.issues_export_limit.to_i %> <p class="icon icon-warning"> |