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

Make render :partial, :layout consistent between AC and AV

Browse source
This commit is contained in:
Carlhuda 2010-03-18 16:55:32 -07:00
parent 71c9337f45
commit edb5991a14
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionpack/lib/abstract_controller/layouts.rb
View file

@ -290,12 +290,6 @@ module AbstractController
layout = options.key?(:layout) ? options.delete(:layout) : :default
value = _layout_for_option(layout)
options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
# TODO Layout for partials should be handled here, because inside the
# partial renderer it looks for the layout as a partial.
if options.key?(:partial) && options[:layout]
options[:layout] = view_context.find_layout(options[:layout])
end
end
end

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

@ -513,10 +513,6 @@ class TestController < ActionController::Base
end
end
def partial_only_with_layout
render :partial => "partial_only", :layout => true
end
def render_to_string_with_partial
@partial_only = render_to_string :partial => "partial_only"
@partial_with_locals = render_to_string :partial => "customer", :locals => { :customer => Customer.new("david") }
@ -640,8 +636,7 @@ class TestController < ActionController::Base
"rendering_nothing_on_layout", "render_text_hello_world",
"render_text_hello_world_with_layout",
"hello_world_with_layout_false",
"partial_only", "partial_only_with_layout",
"accessing_params_in_template",
"partial_only", "accessing_params_in_template",
"accessing_params_in_template_with_layout",
"render_with_explicit_template",
"render_with_explicit_string_template",
@ -1204,11 +1199,6 @@ class RenderTest < ActionController::TestCase
assert_equal 'partial html', @response.body
end
def test_partial_only_with_layout
get :partial_only_with_layout
assert_equal "<html>only partial</html>", @response.body
end
def test_render_to_string_partial
get :render_to_string_with_partial
assert_equal "only partial", assigns(:partial_only)