@@ -132,11 +132,19 @@ module WillPaginate
# <%= page_entries_info @posts %>
# #-> Displaying entries 6 - 10 of 26 in total
def page_entries_info(collection)
- %{Displaying entries <b>%d - %d</b> of <b>%d</b> in total} % [
- collection.offset + 1,
- collection.offset + collection.length,
- collection.total_entries
- ]
+ if collection.total_pages < 2
+ case collection.size
+ when 0; 'No entries found'
+ when 1; 'Displaying <b>1</b> entry'
+ else; "Displaying <b>all #{collection.size}</b> entries"
+ end
+ else
+ %{Displaying entries <b>%d - %d</b> of <b>%d</b> in total} % [
+ collection.offset + 1,
+ collection.offset + collection.length,
+ collection.total_entries
+ ]
+ end
end
def self.total_pages_for_collection(collection) #:nodoc:
lib/will_paginate/view_helpers.rb
@@ -156,6 +156,19 @@ class ViewTest < Test::Unit::TestCase
assert_equal %{Displaying entries <b>25 - 26</b> of <b>26</b> in total},
@html_result
end
+
+ def test_page_entries_info_with_single_page_collection
+ @template = '<%= page_entries_info collection %>'
+
+ paginate(('a'..'d').to_a.paginate(:page => 1, :per_page => 5))
+ assert_equal %{Displaying <b>all 4</b> entries}, @html_result
+
+ paginate(['a'].paginate(:page => 1, :per_page => 5))
+ assert_equal %{Displaying <b>1</b> entry}, @html_result
+
+ paginate([].paginate(:page => 1, :per_page => 5))
+ assert_equal %{No entries found}, @html_result
+ end
## parameter handling in page links ##
test/view_test.rb
5b0e0b8d7d8c2096c157212447a6f1925f6ae295
Mislav Marohnić
mislav.marohnic@gmail.com
http://github.com/mislav/will_paginate/commit/cc1516ddd201c5c1c25fd304943ebad529dbfa74
cc1516ddd201c5c1c25fd304943ebad529dbfa74
2008-04-21T08:22:04-07:00
2008-04-21T08:22:04-07:00
Change output of "page_entries_info" on single-page collection and erraneous output with empty collection as reported by Tim Chater.
e20523d583990c76e3f4b2d3d0dceeb20f998764
Mislav Marohnić
mislav.marohnic@gmail.com