diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-01-18 12:51:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-01-18 12:51:41 +0000 |
| commit | d10ab869a7433c0e7c6f8ddbc56e23ec2098c97c (patch) | |
| tree | e0809fb27291ad1a0331baac619518e197232c0d /app/models/query.rb | |
| parent | 3c0c16901c1ae4794f8543ca6f3404a98ff2d82d (diff) | |
| download | redmine-d10ab869a7433c0e7c6f8ddbc56e23ec2098c97c.tar.gz redmine-d10ab869a7433c0e7c6f8ddbc56e23ec2098c97c.zip | |
Handle csv columns selection in query to preload appropriate associations (#24865).
git-svn-id: http://svn.redmine.org/redmine/trunk@16219 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/query.rb')
| -rw-r--r-- | app/models/query.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index aba3dc854..7c85d7164 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -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 |