Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-09 23:06:05 +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

3
app/models/query.rb
View File

@@ -670,6 +670,9 @@ class Query < ActiveRecord::Base
if names
names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
if names.delete(:all_inline)
names = available_inline_columns.map(&:name) | names
end
# Set column_names to nil if default columns
if names == default_columns_names
names = nil