From dab360e18129c8f4916b78d00d49ed9dda5ccd8a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 21 May 2005 18:51:08 +0000 Subject: Added DoubleRenderError exception that'll be raised if render* is called twice #518 [Nicholas Seckar]. Fixed exceptions occuring after render has been called #1096 [Nicholas Seckar] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1348 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 12 ++++++++++-- 1 file changed, 10 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 160318c98b..5eba5c7167 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -24,6 +24,8 @@ module ActionController #:nodoc: end class MissingFile < ActionControllerError #:nodoc: end + class DoubleRenderError < ActionControllerError #:nodoc: + end # Action Controllers are made up of one or more actions that performs its purpose and then either renders a template or # redirects to another action. An action is defined as a public method on the controller, which will automatically be @@ -476,7 +478,7 @@ module ActionController #:nodoc: # considerably faster than rendering through the template engine. # Use block for response body if provided (useful for deferred rendering or streaming output). def render_text(text = nil, status = nil, &block) #:doc: - return if performed? + raise DoubleRenderError, "Can only render or redirect once per action" if performed? add_variables_to_assigns @response.headers["Status"] = status.to_s || DEFAULT_RENDER_STATUS_CODE @response.body = block_given? ? block : text @@ -494,6 +496,12 @@ module ActionController #:nodoc: add_variables_to_assigns @template.render_file(template_name) end + + # Clears the rendered results, allowing for another render or redirect to be performed. + def erase_render_results #:nodoc: + @response.body = nil + @performed_render = false + end # Renders the partial specified by partial_path, which by default is the name of the action itself. Example: # @@ -659,7 +667,7 @@ module ActionController #:nodoc: # redirect_to_url "http://www.rubyonrails.org". If the resource has moved permanently, it's possible to pass true as the # second parameter and the browser will get "301 Moved Permanently" instead of "302 Found". def redirect_to_url(url, permanently = false) #:doc: - return if performed? + raise DoubleRenderError, "Can only render or redirect once per action" if performed? logger.info("Redirected to #{url}") unless logger.nil? @response.redirect(url, permanently) @performed_redirect = true -- cgit v1.2.3