Inline a method used by render_partial. Closes #2881.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3073 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
60e425af33
commit
e9a4e4d88b
@ -117,15 +117,12 @@ def add_counter_to_local_assigns!(partial_name, local_assigns)
|
|||||||
end
|
end
|
||||||
|
|
||||||
def add_object_to_local_assigns!(partial_name, local_assigns, object)
|
def add_object_to_local_assigns!(partial_name, local_assigns, object)
|
||||||
local_assigns[partial_name.intern] ||= unwrap_object(object) || controller.instance_variable_get("@#{partial_name}")
|
local_assigns[partial_name.intern] ||=
|
||||||
end
|
if object.is_a?(ActionView::Base::ObjectWrapper)
|
||||||
|
object.value
|
||||||
def unwrap_object(object)
|
else
|
||||||
if object.is_a?(ActionView::Base::ObjectWrapper)
|
object
|
||||||
object.value
|
end || controller.instance_variable_get("@#{partial_name}")
|
||||||
else
|
|
||||||
object
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user