Remove changes in 'paginate' helper

2015-12-28 17:01:02 +01:00 · 2015-12-28 17:01:02 +01:00 · b2fbeb377d
parent 8d4555037a
commit b2fbeb377d
1 changed files with 2 additions and 4 deletions
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@ -97,10 +97,8 @@ module API
    end

    def paginate(relation)
-      page = (params[:page] || 1).to_i
-      per_page = (params[:per_page] || 30).to_i
-
-      paginated = relation.page(page).per(per_page)
+      per_page  = params[:per_page].to_i
+      paginated = relation.page(params[:page]).per(per_page)
      add_pagination_headers(paginated, per_page)

      paginated