Check params[:per_page] before settings[:per_page]

davidcelis · davidcelis · commit 946437a1658c · 2014-05-20T09:02:49.000-07:00
This fixes #12 Signed-off-by: David Celis <me@davidcel.is>
diff --git a/lib/grape/pagination.rb b/lib/grape/pagination.rb
@@ -5,7 +5,7 @@ def self.included(base)
         def paginate(collection)
           options = {
             :page     => params[:page],
-            :per_page => (settings[:per_page] || params[:per_page])
+            :per_page => (params[:per_page] || settings[:per_page])
           }
           collection = ApiPagination.paginate(collection, options)
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ def self.included(base)`
`5`	`5`	`def paginate(collection)`
`6`	`6`	`options = {`
`7`	`7`	`:page => params[:page],`
`8`		`- :per_page => (settings[:per_page] \|\| params[:per_page])`
	`8`	`+ :per_page => (params[:per_page] \|\| settings[:per_page])`
`9`	`9`	`}`
`10`	`10`	`collection = ApiPagination.paginate(collection, options)`
`11`	`11`