From c6123c37030b715d088860ea1ca79060659b0e3c Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Fri, 20 Mar 2009 16:50:51 -0700 Subject: Finished implementing layout for render :text --- actionpack/lib/action_controller/abstract/renderer.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_controller/abstract') diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb index d95158be42..5daade6109 100644 --- a/actionpack/lib/action_controller/abstract/renderer.rb +++ b/actionpack/lib/action_controller/abstract/renderer.rb @@ -20,8 +20,8 @@ module AbstractController @_action_view ||= ActionView::Base.new(self.class.view_paths, {}, self) end - def render(name = action_name, options = {}) - self.response_body = render_to_string(name, options) + def render(options = {}) + self.response_body = render_to_string(options) end # Raw rendering of a template. @@ -30,7 +30,9 @@ module AbstractController # @option _layout The relative path to the layout template to use # # :api: plugin - def render_to_string(name = action_name, options = {}) + def render_to_string(options = {}) + name = options[:_template_name] || action_name + template = options[:_template] || view_paths.find_by_parts(name.to_s, formats, options[:_prefix]) _render_template(template, options) end -- cgit v1.2.3