diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-08-07 01:51:50 -0300 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-08-07 01:51:50 -0300 |
commit | 8534c5bf193c6a234d55116d520a54a1b634a93e (patch) | |
tree | ee3c604e911759f8f3962d7c7ea9d5c906b61eb5 /actionpack/lib/action_view/render/rendering.rb | |
parent | 9b506484f1e72aeba2f1fd4af3e39cf450f1d4a9 (diff) | |
download | rails-8534c5bf193c6a234d55116d520a54a1b634a93e.tar.gz rails-8534c5bf193c6a234d55116d520a54a1b634a93e.tar.bz2 rails-8534c5bf193c6a234d55116d520a54a1b634a93e.zip |
Start cleaning up partial path
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
-rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 86a59dd1bc..32c30e8f68 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -123,19 +123,25 @@ module ActionView layout ? _render_content_with_layout(text, layout, options[:locals]) : text end - def render_template(*args) + # This is the API to render a ViewContext's template from a controller. + # + # Internal Options: + # _template:: The Template object to render + # _layout:: The layout, if any, to wrap the Template in + # _partial:: true if the template is a partial + def render_template(options) @assigns_added = nil - _render_template_with_layout(*args) + template, layout, partial = options.values_at(:_template, :_layout, :_partial) + _render_template_with_layout(template, layout, options, partial) end - def _render_template_with_layout(template, layout = nil, options = {}, partial = false) + def _render_template_with_layout(template, layout = nil, options = {}, partial = nil) logger && logger.info("Rendering #{template.identifier}#{' (#{options[:status]})' if options[:status]}") locals = options[:locals] || {} content = if partial - object = partial unless partial == true - _render_partial_object(template, options, object) + _render_partial_object(template, options) else _render_template(template, locals) end |