From 805debddd0b5429567773400dc78d97579e8d95a 2014-02-23 08:11:59 From: Jean-Philippe Lang Date: 2014-02-23 08:11:59 Subject: [PATCH] Merged r12910 and r12911 (#16091). git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 0b6f250..dbc55cb 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 9a6d278..bf90f56 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