提交 c7368fd8 编写于 作者: R Richard Schneeman

Merge pull request #22279 from yui-knk/fix_object_partial_false

Respect value of `:object` if `:object` is false when rendering
* Respect value of `:object` if `:object` is false when rendering.
Fixes #22260.
*Yuichiro Kaneko*
* Generate `week_field` input values using a 1-based index and not a 0-based index
as per the W3 spec: http://www.w3.org/TR/html-markup/datatypes.html#form.data.week
......
......@@ -337,7 +337,7 @@ def render_partial
layout = find_template(layout.to_s, @template_keys)
end
object ||= locals[as]
object = locals[as] if object.nil? # Respect object when object is false
locals[as] = object if @has_object
content = @template.render(view, locals) do |*name|
......
<%= klass.class.name %>
\ No newline at end of file
......@@ -247,6 +247,8 @@ def test_render_file_with_errors
def test_render_object
assert_equal "Hello: david", @view.render(:partial => "test/customer", :object => Customer.new("david"))
assert_equal "FalseClass", @view.render(:partial => "test/klass", :object => false)
assert_equal "NilClass", @view.render(:partial => "test/klass", :object => nil)
end
def test_render_object_with_array
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册