diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-25 11:54:07 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-25 11:54:07 -0300 |
commit | 68a2a6711643db6b8b0775fe004bc0de0cdc07db (patch) | |
tree | d18132851add017e8766c533d31cac2c7e939d19 /actionview/lib/action_view/renderer/partial_renderer.rb | |
parent | 5a6868b6175167d91fcfaed82b4d4627281a4878 (diff) | |
parent | ca6aba7f30ad9910f17e4c5b39667889d9518794 (diff) | |
download | rails-68a2a6711643db6b8b0775fe004bc0de0cdc07db.tar.gz rails-68a2a6711643db6b8b0775fe004bc0de0cdc07db.tar.bz2 rails-68a2a6711643db6b8b0775fe004bc0de0cdc07db.zip |
Merge pull request #18948 from kaspth/automatic-collection-caching
Merge multi_fetch_fragments.
Diffstat (limited to 'actionview/lib/action_view/renderer/partial_renderer.rb')
-rw-r--r-- | actionview/lib/action_view/renderer/partial_renderer.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionview/lib/action_view/renderer/partial_renderer.rb b/actionview/lib/action_view/renderer/partial_renderer.rb index 5ff15411cf..56b8ab1e2d 100644 --- a/actionview/lib/action_view/renderer/partial_renderer.rb +++ b/actionview/lib/action_view/renderer/partial_renderer.rb @@ -1,3 +1,4 @@ +require 'action_view/renderer/partial_renderer/collection_caching' require 'thread_safe' module ActionView @@ -280,6 +281,8 @@ module ActionView # <%- end -%> # <% end %> class PartialRenderer < AbstractRenderer + include CollectionCaching + PREFIXED_PARTIAL_NAMES = ThreadSafe::Cache.new do |h, k| h[k] = ThreadSafe::Cache.new end @@ -321,8 +324,9 @@ module ActionView spacer = find_template(@options[:spacer_template], @locals.keys).render(@view, @locals) end - result = @template ? collection_with_template : collection_without_template - result.join(spacer).html_safe + cache_collection_render do + @template ? collection_with_template : collection_without_template + end.join(spacer).html_safe end def render_partial |