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_controller | |
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_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/implicit_render.rb | 3 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb index da717fcce2..c3e3b8fdf5 100644 --- a/actionpack/lib/action_controller/metal/implicit_render.rb +++ b/actionpack/lib/action_controller/metal/implicit_render.rb @@ -12,8 +12,7 @@ module ActionController def method_for_action(action_name) super || begin - # TODO This should use template lookup - if view_paths.exists?(action_name.to_s, details_for_render, controller_path) + if template_exists?(action_name.to_s, :_prefix => controller_path) "default_render" end end diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 0a4215028b..e2d2e2312b 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -5,7 +5,7 @@ module ActionController include ActionController::RackDelegation include AbstractController::Rendering - def process_action(*) + def process(*) self.formats = request.formats.map {|x| x.to_sym } super end |