From 8266867881e708813eec3c359869d14098e3789d Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Sat, 9 Jul 2005 15:31:06 +0000 Subject: Improved error message for DoubleRenderError git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1779 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller/base.rb') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 05083360aa..7b30b3d6f1 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -26,6 +26,11 @@ module ActionController #:nodoc: class MissingFile < ActionControllerError #:nodoc: end class DoubleRenderError < ActionControllerError #:nodoc: + DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and only once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\". Finally, note that to cause a before filter to halt execution of the rest of the filter chain, the filter must return false, explicitly, so \"render(...) and return false\"." + + def initialize(message=nil) + super(message || DEFAULT_MESSAGE) + end end # Action Controllers are made up of one or more actions that performs its purpose and then either renders a template or @@ -560,7 +565,7 @@ module ActionController #:nodoc: # render :nothing => true, :status => 401 def render(options = {}, deprecated_status = nil) #:doc: # puts "Rendering: #{options.inspect}" - raise DoubleRenderError, "Can only render or redirect once per action" if performed? + raise DoubleRenderError if performed? # Backwards compatibility return render({ :template => options || default_template_name, :status => deprecated_status }) if !options.is_a?(Hash) @@ -684,7 +689,7 @@ module ActionController #:nodoc: def redirect_to(options = {}, *parameters_for_method_reference) #:doc: case options when %r{^\w+://.*} - raise DoubleRenderError, "Can only render or redirect once per action" if performed? + raise DoubleRenderError if performed? logger.info("Redirected to #{options}") unless logger.nil? response.redirect(options) response.redirected_to = options -- cgit v1.2.3