Merge pull request #56 from TDT-GmbH/fix-users-roles-pagination

Fix users and roles index query for pagination
genieacs · Jan 10, 2017 · 1256b79 · 1256b79
2 parents 3f2c790 + e2cc566
commit 1256b79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
@@ -2,7 +2,9 @@ class RolesController < ApplicationController
 
   def index
     can?(:read, 'roles') do
-      @roles = Role.all
+      off = params.include?(:page) ? (Integer(params[:page]) - 1) * Rails.configuration.page_size : 0
+      lim = Rails.configuration.page_size
+      @roles = Role.limit(lim).offset(off)
       @total = Role.count
     end
   end

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -2,7 +2,9 @@ class UsersController < ApplicationController
 
   def index
     can?(:read, 'users') do
-      @users = User.all
+      off = params.include?(:page) ? (Integer(params[:page]) - 1) * Rails.configuration.page_size : 0
+      lim = Rails.configuration.page_size
+      @users = User.limit(lim).offset(off)
       @total = User.count
     end
   end