diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-08 02:04:18 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-08 02:04:18 +0100 |
commit | ffd8d753f171a33cb0f8dadaff7fc5ba12b8f6b0 (patch) | |
tree | fca50e828f91520f2e99323eff90e1bbc81bea7d /actionpack/lib/action_view/render/rendering.rb | |
parent | c7564d74e8a9b451f9fc78566ab0c734671f9612 (diff) | |
download | rails-ffd8d753f171a33cb0f8dadaff7fc5ba12b8f6b0.tar.gz rails-ffd8d753f171a33cb0f8dadaff7fc5ba12b8f6b0.tar.bz2 rails-ffd8d753f171a33cb0f8dadaff7fc5ba12b8f6b0.zip |
Move layout lookup to views.
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
-rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 1be5675e37..b92a03ddbd 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -88,12 +88,26 @@ module ActionView # _layout:: The layout, if any, to wrap the Template in def render_template(options) _evaluate_assigns_and_ivars - template, layout = options.values_at(:_template, :_layout) + template, layout = options.values_at(:_template, :layout) _render_template(template, layout, options) end + def _find_layout(template, layout) + begin + prefix = "layouts" unless layout =~ /\blayouts/ + layout = find(layout, prefix) + rescue ActionView::MissingTemplate => e + update_details(:formats => nil) do + raise unless template_lookup.exists?(layout, prefix) + end + end + end + def _render_template(template, layout = nil, options = {}) + self.formats = template.details[:formats] + locals = options[:locals] || {} + layout = _find_layout(template, layout) if layout.is_a?(String) ActiveSupport::Notifications.instrument("action_view.render_template", :identifier => template.identifier, :layout => layout.try(:identifier)) do |