From 1cbd0cf1f8c1715e486320f2301ec94b72586ae0 Mon Sep 17 00:00:00 2001 From: Neeraj Singh Date: Fri, 12 Nov 2010 11:18:37 -0500 Subject: [PATCH] Do not execute query to get count of records twice. [#5958 state:resolved] --- .../lib/action_view/renderer/partial_renderer.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index c580397..656961d 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -45,7 +45,9 @@ module ActionView identifier = ((@template = find_partial) ? @template.identifier : @path) if @collection - instrument(:collection, :identifier => identifier || "collection", :count => @collection.size) do + size = @collection.size + instrument(:collection, :identifier => identifier || "collection", :count => size) do + return nil if size == 0 render_collection end else @@ -57,8 +59,6 @@ module ActionView end def render_collection - return nil if @collection.blank? - if @options.key?(:spacer_template) spacer = find_template(@options[:spacer_template]).render(@view, @locals) end -- 1.7.2