kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Set proper rendered_format when doing render :inline

Browse source 
Closes #5632
This commit is contained in:
Santiago Pastorino 2012-03-28 18:52:56 -03:00
parent c82fd8fc2a
commit f0268d56af
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/lib/action_view/renderer/template_renderer.rb
View file

@ -9,8 +9,8 @@ module ActionView
context = @lookup_context context = @lookup_context
unless context.rendered_format unless context.rendered_format
context.rendered_format = template.formats.first context.formats = template.formats unless template.formats.empty?
context.formats = template.formats context.rendered_format = context.formats.first
end end
render_template(template, options[:layout], options[:locals]) render_template(template, options[:layout], options[:locals])

1
actionpack/test/controller/render_test.rb
View file

@ -1022,6 +1022,7 @@ class RenderTest < ActionController::TestCase
def test_accessing_local_assigns_in_inline_template def test_accessing_local_assigns_in_inline_template
get :accessing_local_assigns_in_inline_template, :local_name => "Local David" get :accessing_local_assigns_in_inline_template, :local_name => "Local David"
assert_equal "Goodbye, Local David", @response.body assert_equal "Goodbye, Local David", @response.body
assert_equal "text/html", @response.content_type
end end
def test_should_implicitly_render_html_template_from_xhr_request def test_should_implicitly_render_html_template_from_xhr_request