Merged r12910 and r12911 (#16091).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
01aa2db0af
commit
805debddd0
|
@ -62,6 +62,9 @@ class IssuesController < ApplicationController
|
||||||
case params[:format]
|
case params[:format]
|
||||||
when 'csv', 'pdf'
|
when 'csv', 'pdf'
|
||||||
@limit = Setting.issues_export_limit.to_i
|
@limit = Setting.issues_export_limit.to_i
|
||||||
|
if params[:columns] == 'all'
|
||||||
|
@query.column_names = @query.available_inline_columns.map(&:name)
|
||||||
|
end
|
||||||
when 'atom'
|
when 'atom'
|
||||||
@limit = Setting.feeds_limit.to_i
|
@limit = Setting.feeds_limit.to_i
|
||||||
when 'xml', 'json'
|
when 'xml', 'json'
|
||||||
|
|
|
@ -334,6 +334,9 @@ class IssueQuery < Query
|
||||||
offset(options[:offset])
|
offset(options[:offset])
|
||||||
|
|
||||||
scope = scope.preload(:custom_values)
|
scope = scope.preload(:custom_values)
|
||||||
|
if has_column?(:author)
|
||||||
|
scope = scope.preload(:author)
|
||||||
|
end
|
||||||
|
|
||||||
issues = scope.all
|
issues = scope.all
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue