Skip to content
Browse files

Make sure render :template works with :locals. [#524 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
1 parent aff2d33 commit f5052dd8a39099e4930faafe9b01e63ced2f6391 @timhaines timhaines committed with lifo Jul 2, 2008
Showing with 13 additions and 1 deletion.
  1. +4 −1 actionpack/lib/action_controller/base.rb
  2. +9 −0 actionpack/test/controller/new_render_test.rb
View
5 actionpack/lib/action_controller/base.rb
@@ -733,6 +733,9 @@ def append_view_path(path)
# # Renders the template located in [TEMPLATE_ROOT]/weblog/show.r(html|xml) (in Rails, app/views/weblog/show.erb)
# render :template => "weblog/show"
#
+ # # Renders the template with a local variable
+ # render :template => "weblog/show", :locals => {:customer => Customer.new}
+ #
# === Rendering a file
#
# File rendering works just like action rendering except that it takes a filesystem path. By default, the path
@@ -855,7 +858,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
render_for_file(file, options[:status], options[:use_full_path], options[:locals] || {})
elsif template = options[:template]
- render_for_file(template, options[:status], true)
+ render_for_file(template, options[:status], true, options[:locals] || {})
elsif inline = options[:inline]
add_variables_to_assigns
View
9 actionpack/test/controller/new_render_test.rb
@@ -268,6 +268,10 @@ def render_with_explicit_template
render :template => "test/hello_world"
end
+ def render_with_explicit_template_with_locals
+ render :template => "test/render_file_with_locals", :locals => { :secret => 'area51' }
+ end
+
def double_render
render :text => "hello"
render :text => "world"
@@ -820,6 +824,11 @@ def test_render_text_with_assigns
assert_equal "world", assigns["hello"]
end
+ def test_template_with_locals
+ get :render_with_explicit_template_with_locals
+ assert_equal "The secret is area51\n", @response.body
+ end
+
def test_update_page
get :update_page
assert_template nil

0 comments on commit f5052dd

Please sign in to comment.
Something went wrong with that request. Please try again.