lib/blacklight/solr/facet_paginator.rb in blacklight-5.5.2 vs lib/blacklight/solr/facet_paginator.rb in blacklight-5.5.3

@@ -35,11 +35,11 @@
     # :offset => current item offset, default 0
     # :sort => 'count' or 'index', solr tokens for facet value sorting, default 'count'. 
     def initialize(all_facet_values, arguments)
       # to_s.to_i will conveniently default to 0 if nil
       @offset = arguments[:offset].to_s.to_i 
-      @limit =  arguments[:limit].to_s.to_i
+      @limit = arguments[:limit]
       # count is solr's default
       @sort = arguments[:sort] || "count" 
 
       @all = all_facet_values
     end
@@ -80,11 +80,11 @@
       !first_page?
     end
     deprecation_deprecate :has_next?
 
     def last_page?
-      total_count <= limit
+      limit.nil? || total_count <= limit
     end
 
     def first_page?
       current_page == 1
     end
@@ -110,12 +110,12 @@
     def as_json(_ = nil)
       { 'items' => items.as_json, 'limit' => limit, 'offset' => offset, 'sort' => sort }
     end
 
     private
-      # setting limit to 0 implies no limit
+      # setting limit to nil implies no limit
       # @return an array of facets on the page
       def items_for_limit(values)
-        limit == 0 ? values : values.take(limit)
+        limit.nil? ? values : values.take(limit)
       end
   end
 end