mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

make the cops happy

This commit is contained in:
Aaron Patterson 2020-02-27 15:38:20 -08:00
parent 8d539bde7b
commit 4a4a8be064
No known key found for this signature in database
GPG Key ID: 953170BCB4FFAFC6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actionview/lib/action_view/renderer/collection_renderer.rb
View File

@ -89,7 +89,7 @@ module ActionView
template = find_template(partial, @locals.keys + iter_vars) template = find_template(partial, @locals.keys + iter_vars)
layout = if !block && (layout = @options[:layout]) layout = if !block && (layout = @options[:layout])
find_template(layout.to_s, @locals.keys + iter_vars) find_template(layout.to_s, @locals.keys + iter_vars)
end end
render_collection(collection, context, partial, template, layout, block) render_collection(collection, context, partial, template, layout, block)
@ -129,8 +129,8 @@ module ActionView
end end
collection_body = if template collection_body = if template
cache_collection_render(payload, view, template, collection) do |collection| cache_collection_render(payload, view, template, collection) do |filtered_collection|
collection_with_template(view, template, layout, collection) collection_with_template(view, template, layout, filtered_collection)
end end
else else
collection_with_template(view, nil, layout, collection) collection_with_template(view, nil, layout, collection)

1
actionview/lib/action_view/renderer/renderer.rb
View File

@ -100,7 +100,6 @@ module ActionView
end end
private private
def collection_from_options(options) def collection_from_options(options)
if options.key?(:collection) if options.key?(:collection)
collection = options[:collection] collection = options[:collection]