提交 2f8be7eb 编写于 作者: S Sean Griffin

Fix warning in AV tests

Originally caused by #17771
上级 3802de4a
......@@ -366,10 +366,12 @@ def setup(context, options, block)
partial = options[:partial]
if String === partial
@object = options[:object] if options.has_key?(:object)
@has_object = options.key?(:object)
@object = options[:object]
@collection = collection_from_options
@path = partial
else
@has_object = true
@object = partial
@collection = collection_from_object || collection_from_options
......@@ -506,7 +508,7 @@ def merge_prefix_into_object_path(prefix, object_path)
def retrieve_template_keys
keys = @locals.keys
keys << @variable if defined?(@object) || @collection
keys << @variable if @has_object || @collection
if @collection
keys << @variable_counter
keys << @variable_iteration
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册