[#889] count value is displaying count of page rather than of collection

tslocke · Mar 11, 2011 · 090ac14 · 090ac14
1 parent 5c4db45
commit 090ac14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/hobo/lib/hobo/rapid/generators/rapid/pages.dryml.erb b/hobo/lib/hobo/rapid/generators/rapid/pages.dryml.erb
@@ -33,7 +33,7 @@ model_key = model.to_s.underscore
         </h2>
 
         <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&this.size">
+          <ht key="<%= model_key %>.collection.count" count="&collection_count">
             <count summary/>
           </ht>
         </p>
@@ -306,7 +306,7 @@ new_link = :new.in?(actions)
         </h3>
 <% end -%>
         <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&this.size">
+          <ht key="<%= model_key %>.collection.count" count="&collection_count">
             <count summary/>
           </ht>
         </p>

diff --git a/hobo/lib/hobo/rapid/helper.rb b/hobo/lib/hobo/rapid/helper.rb
@@ -102,7 +102,10 @@ def no_break(s)
         s.gsub(' ', '&nbsp;')
       end
 
-
+      # returns the number of items in the collection.  See LH #889
+      def collection_count
+        this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
+      end
 
 
       def in_place_editor(attributes, this=nil)