diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-24 15:12:52 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-24 15:13:19 -0700 |
commit | 07da5aebb165f824d540fac620d2374b7a3799bb (patch) | |
tree | 562ad8d08cf75209f486472631593e4783910664 /actionview/lib/action_view/renderer/partial_renderer.rb | |
parent | ef8315ac784aa778b71c803a8aa018676880b396 (diff) | |
download | rails-07da5aebb165f824d540fac620d2374b7a3799bb.tar.gz rails-07da5aebb165f824d540fac620d2374b7a3799bb.tar.bz2 rails-07da5aebb165f824d540fac620d2374b7a3799bb.zip |
Simplify cache hit logging
CacheHelper is mixed in to Helpers, Helpers is mixed in to AV::Base.
This means we can count on instances of AV::Base to have the "cache hit"
method on them, and we can stop setting an ivar for cache logging and
just ask the view if it was a cache hit.
Diffstat (limited to 'actionview/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r-- | actionview/lib/action_view/renderer/partial_renderer.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb index 4314e1ff71..4b6aecd187 100644 --- a/actionview/lib/action_view/renderer/partial_renderer.rb +++ b/actionview/lib/action_view/renderer/partial_renderer.rb @@ -333,8 +333,6 @@ module ActionView view, locals, block = @view, @locals, @block object, as = @object, @variable - view.instance_variable_set(:@log_payload_for_partial_render, payload) - if !block && (layout = @options[:layout]) layout = find_template(layout.to_s, @template_keys) end @@ -347,6 +345,7 @@ module ActionView end content = layout.render(view, locals) { content } if layout + payload[:cache_hit] = view.cache_hit content end end |