Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 05:45:49 +01:00
Code Issues Packages Projects Releases Activity

Handle csv columns selection in query to preload appropriate associations (#24865).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16219 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-18 12:51:41 +00:00
parent 3c0c16901c
commit d10ab869a7
6 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/helpers/queries_helper.rb
View File

@@ -231,13 +231,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?
columns << column
end
end
columns = query.columns
Redmine::Export::CSV.generate do |csv|
# csv header fields
@@ -310,10 +304,8 @@ module QueriesHelper
else
tags << hidden_field_tag("f[]", "", :id => nil)
end
if query.column_names.present?
query.column_names.each do |name|
tags << hidden_field_tag("c[]", name, :id => nil)
end
query.columns.each do |column|
tags << hidden_field_tag("c[]", column.name, :id => nil)
end
if query.totalable_names.present?
query.totalable_names.each do |name|