diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-02-23 08:11:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-02-23 08:11:59 +0000 |
| commit | 805debddd0b5429567773400dc78d97579e8d95a (patch) | |
| tree | 8ce1f6220184c1c728588e080391238171510985 | |
| parent | 01aa2db0af8b1802a7a8090cdc010c9e94ed0faf (diff) | |
| download | redmine-805debddd0b5429567773400dc78d97579e8d95a.tar.gz redmine-805debddd0b5429567773400dc78d97579e8d95a.zip | |
Merged r12910 and r12911 (#16091).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/issues_controller.rb | 3 | ||||
| -rw-r--r-- | app/models/issue_query.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 0b6f25019..dbc55cbd4 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -62,6 +62,9 @@ class IssuesController < ApplicationController case params[:format] when 'csv', 'pdf' @limit = Setting.issues_export_limit.to_i + if params[:columns] == 'all' + @query.column_names = @query.available_inline_columns.map(&:name) + end when 'atom' @limit = Setting.feeds_limit.to_i when 'xml', 'json' diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 9a6d278fe..bf90f56d1 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -334,6 +334,9 @@ class IssueQuery < Query offset(options[:offset]) scope = scope.preload(:custom_values) + if has_column?(:author) + scope = scope.preload(:author) + end issues = scope.all |