Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix HTML fallback for explicit templates [#2052 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
  • Loading branch information...
commit 87e8b162463f13bd50d27398f020769460a770e3 1 parent 77f7d98
@al2o3cr al2o3cr authored josh committed
View
10 actionpack/lib/action_controller/layout.rb
@@ -198,7 +198,7 @@ def normalize_conditions(conditions)
# is called and the return value is used. Likewise if the layout was specified as an inline method (through a proc or method
# object). If the layout was defined without a directory, layouts is assumed. So <tt>layout "weblog/standard"</tt> will return
# weblog/standard, but <tt>layout "standard"</tt> will return layouts/standard.
- def active_layout(passed_layout = nil)
+ def active_layout(passed_layout = nil, options = {})
layout = passed_layout || default_layout
return layout if layout.respond_to?(:render)
@@ -208,7 +208,7 @@ def active_layout(passed_layout = nil)
else layout
end
- find_layout(active_layout, default_template_format) if active_layout
+ find_layout(active_layout, default_template_format, options[:html_fallback]) if active_layout
end
private
@@ -220,8 +220,8 @@ def default_layout #:nodoc:
nil
end
- def find_layout(layout, format) #:nodoc:
- view_paths.find_template(layout.to_s =~ /layouts\// ? layout : "layouts/#{layout}", format, false)
+ def find_layout(layout, format, html_fallback=false) #:nodoc:
+ view_paths.find_template(layout.to_s =~ /layouts\// ? layout : "layouts/#{layout}", format, html_fallback)
rescue ActionView::MissingTemplate
raise if Mime::Type.lookup_by_extension(format.to_s).html?
end
@@ -234,7 +234,7 @@ def pick_layout(options)
when NilClass, TrueClass
active_layout if action_has_layout? && candidate_for_layout?(:template => default_template_name)
else
- active_layout(layout)
+ active_layout(layout, :html_fallback => true)
end
else
active_layout if action_has_layout? && candidate_for_layout?(options)
View
16 actionpack/test/controller/render_test.rb
@@ -313,6 +313,10 @@ def render_implicit_html_template_from_xhr_request
def render_implicit_js_template_without_layout
end
+ def render_html_explicit_template_and_layout
+ render :template => 'test/render_implicit_html_template_from_xhr_request', :layout => 'layouts/default_html'
+ end
+
def formatted_html_erb
end
@@ -720,6 +724,8 @@ def determine_layout
"delete_with_js", "update_page", "update_page_with_instance_variables"
"layouts/standard"
+ when "render_implicit_js_template_without_layout"
+ "layouts/default_html"
when "action_talk_to_layout", "layout_overriding_layout"
"layouts/talk_from_action"
when "render_implicit_html_template_from_xhr_request"
@@ -817,6 +823,11 @@ def test_do_with_render_text_and_layout
assert_equal "<html>hello world, I'm here!</html>", @response.body
end
+ def test_xhr_with_render_text_and_layout
+ xhr :get, :render_text_hello_world_with_layout
+ assert_equal "<html>hello world, I'm here!</html>", @response.body
+ end
+
def test_do_with_render_action_and_layout_false
get :hello_world_with_layout_false
assert_equal 'Hello world!', @response.body
@@ -1056,6 +1067,11 @@ def test_should_implicitly_render_html_template_from_xhr_request
assert_equal "XHR!\nHello HTML!", @response.body
end
+ def test_should_render_explicit_html_template_with_html_layout
+ xhr :get, :render_html_explicit_template_and_layout
+ assert_equal "<html>Hello HTML!</html>\n", @response.body
+ end
+
def test_should_implicitly_render_js_template_without_layout
get :render_implicit_js_template_without_layout, :format => :js
assert_no_match /<html>/, @response.body
View
1  actionpack/test/fixtures/layouts/default_html.html.erb
@@ -0,0 +1 @@
+<html><%= @content_for_layout %></html>
Please sign in to comment.
Something went wrong with that request. Please try again.