diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-07 19:41:58 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-07 19:41:58 +0100 |
commit | c7564d74e8a9b451f9fc78566ab0c734671f9612 (patch) | |
tree | c903fd5650626a79f53c89ccb1b8e10e1052bae6 /actionpack/lib/action_controller | |
parent | 6e0443fd433393dc1967fab4f4fa06dc2b3c02fd (diff) | |
download | rails-c7564d74e8a9b451f9fc78566ab0c734671f9612.tar.gz rails-c7564d74e8a9b451f9fc78566ab0c734671f9612.tar.bz2 rails-c7564d74e8a9b451f9fc78566ab0c734671f9612.zip |
Added template lookup responsible to hold all information used in template lookup.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 13 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/implicit_render.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 317a9fd951..518272b4cf 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -73,18 +73,5 @@ module ActionController def performed? response_body end - - # ==== Request only view path switching ==== - def append_view_path(path) - view_paths.push(*path) - end - - def prepend_view_path(path) - view_paths.unshift(*path) - end - - def view_paths - view_context.view_paths - end end end diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb index ba2d9b686e..da717fcce2 100644 --- a/actionpack/lib/action_controller/metal/implicit_render.rb +++ b/actionpack/lib/action_controller/metal/implicit_render.rb @@ -12,6 +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) "default_render" end diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 00a09309bf..0a4215028b 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -4,7 +4,6 @@ module ActionController include ActionController::RackDelegation include AbstractController::Rendering - include AbstractController::DetailsCache def process_action(*) self.formats = request.formats.map {|x| x.to_sym } |