From cfe4d0e7db5c3ed448adf625d0d5ea93c371120e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 4 Feb 2010 19:52:51 +0000 Subject: [PATCH] Fixed: invalid format parameter returns a DoubleRenderError on issues index (#4737). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3366 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 09ce9f2db..e45c2f13b 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 @@ -157,10 +157,12 @@ class IssuesController < ApplicationController call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue }) if @issue.save attach_files(@issue, params[:attachments]) - flash[:notice] = l(:notice_successful_create) call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue}) respond_to do |format| format.html { + # Displays a link to the newly created issue in the flash message + link = @template.link_to("##{@issue.id}", {:controller => 'issues', :action => 'show', :id => @issue}) + flash[:notice] = l(:notice_issue_created, :value => link) redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } : { :action => 'show', :id => @issue }) } -- 2.39.5