Some more tweaks to filter paging #160

QutEcoacoustics · Mar 7, 2015 · f4ff2c3 · f4ff2c3
1 parent b5bea0a
commit f4ff2c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/modules/filter/parse.rb b/lib/modules/filter/parse.rb
@@ -33,14 +33,14 @@ def parse_paging(params, default_page, default_items, max_items)
       items = default_items if items.blank?
 
       # parse disable paging settings
-      if disable_paging == 'true'
+      if disable_paging == 'true' || disable_paging == true
         disable_paging = true
       else
         disable_paging = false
       end
 
       # ensure items is always less than max_items
-      items = max_items if items.to_i > max_items
+      fail CustomErrors::UnprocessableEntityError, "Number of items requested #{items} exceeded maximum #{max_items}." if items.to_i > max_items
 
       # calculate offset if able
       offset = (page - 1) * items

diff --git a/lib/modules/filter/query.rb b/lib/modules/filter/query.rb
@@ -236,7 +236,7 @@ def has_paging_params?
     end
 
     def is_paging_disabled?
-      @paging[:disable_paging]
+      @paging[:disable_paging] == 'true' || @paging[:disable_paging] == true
     end
 
     def has_sort_params?