diff options
Diffstat (limited to 'actionpack/lib/action_controller/new_base/layouts.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/layouts.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb index 2351472dad..149847c968 100644 --- a/actionpack/lib/action_controller/new_base/layouts.rb +++ b/actionpack/lib/action_controller/new_base/layouts.rb @@ -3,12 +3,35 @@ module ActionController depends_on ActionController::Renderer depends_on AbstractController::Layouts + module ClassMethods + def _implied_layout_name + controller_path + end + end + def render_to_string(options) + # render :text => ..., :layout => ... + # or + # render :anything_else if !options.key?(:text) || options.key?(:layout) options[:_layout] = options.key?(:layout) ? _layout_for_option(options[:layout]) : _default_layout end super end + + private + + def _layout_for_option(name) + case name + when String then _layout_for_name(name) + when true then _default_layout(true) + when false, nil then nil + else + raise ArgumentError, + "String, true, or false, expected for `layout'; you passed #{name.inspect}" + end + end + end end
\ No newline at end of file |