##// END OF EJS Templates
Merged r12910 and r12911 (#16091)....
Jean-Philippe Lang -
r12645:805debddd0b5
parent child
Show More
@@ -62,6 +62,9 class IssuesController < ApplicationController
62 case params[:format]
62 case params[:format]
63 when 'csv', 'pdf'
63 when 'csv', 'pdf'
64 @limit = Setting.issues_export_limit.to_i
64 @limit = Setting.issues_export_limit.to_i
65 if params[:columns] == 'all'
66 @query.column_names = @query.available_inline_columns.map(&:name)
67 end
65 when 'atom'
68 when 'atom'
66 @limit = Setting.feeds_limit.to_i
69 @limit = Setting.feeds_limit.to_i
67 when 'xml', 'json'
70 when 'xml', 'json'
@@ -334,6 +334,9 class IssueQuery < Query
334 offset(options[:offset])
334 offset(options[:offset])
335
335
336 scope = scope.preload(:custom_values)
336 scope = scope.preload(:custom_values)
337 if has_column?(:author)
338 scope = scope.preload(:author)
339 end
337
340
338 issues = scope.all
341 issues = scope.all
339
342
General Comments 0
You need to be logged in to leave comments. Login now