aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-10-21 17:47:10 -0200
committerYehuda Katz <wycats@gmail.com>2009-11-01 02:23:48 +0100
commit03960048616593c249745d1e321dbcc7f0483c76 (patch)
treee8ef23941eb4e9ea02610921c783504991edfe2a /actionpack/lib/action_controller
parent0cf16ddb88b4fa28c37e576d50d835b100c3f6a1 (diff)
downloadrails-03960048616593c249745d1e321dbcc7f0483c76.tar.gz
rails-03960048616593c249745d1e321dbcc7f0483c76.tar.bz2
rails-03960048616593c249745d1e321dbcc7f0483c76.zip
Add some basic render_test to AbstractController.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/rendering_controller.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering_controller.rb b/actionpack/lib/action_controller/metal/rendering_controller.rb
index 9e8bc82385..c5ade26702 100644
--- a/actionpack/lib/action_controller/metal/rendering_controller.rb
+++ b/actionpack/lib/action_controller/metal/rendering_controller.rb
@@ -65,6 +65,15 @@ module ActionController
controller_path
end
+ def _determine_template(options)
+ if (options.keys & [:partial, :file, :template, :text, :inline]).empty?
+ options[:_template_name] ||= options[:action]
+ options[:_prefix] = _prefix
+ end
+
+ super
+ end
+
def format_for_text
formats.first
end