summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-04 19:58:42 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-04 19:58:42 +0000
commit626b71622db0138506bcd218c0c0ddaaa76bab47 (patch)
tree91914592b5945e9f2df66ec17526d0ad07952208
parentea51dcf911968f7b734ad63456595e9018de63e6 (diff)
downloadredmine-626b71622db0138506bcd218c0c0ddaaa76bab47.tar.gz
redmine-626b71622db0138506bcd218c0c0ddaaa76bab47.zip
Fixed: invalid format parameter returns a DoubleRenderError on issues index (#4737).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3368 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/issues_controller.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 9374d97e7..08032e703 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -57,13 +57,13 @@ class IssuesController < ApplicationController
sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
if @query.valid?
- limit = per_page_option
- respond_to do |format|
- format.html { }
- format.xml { }
- format.atom { limit = Setting.feeds_limit.to_i }
- format.csv { limit = Setting.issues_export_limit.to_i }
- format.pdf { limit = Setting.issues_export_limit.to_i }
+ limit = case params[:format]
+ when 'csv', 'pdf'
+ Setting.issues_export_limit.to_i
+ when 'atom'
+ Setting.feeds_limit.to_i
+ else
+ per_page_option
end
@issue_count = @query.issue_count