From 16ddfaa35d2d5cd01e206ca8a26aeea9e591ac85 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 16 Mar 2018 16:24:42 +0300 Subject: [PATCH] fixed collect scope --- app/Models/Auth/Permission.php | 2 +- app/Models/Auth/Role.php | 2 +- app/Models/Auth/User.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/Auth/Permission.php b/app/Models/Auth/Permission.php index 5303bf74b..4350d5911 100644 --- a/app/Models/Auth/Permission.php +++ b/app/Models/Auth/Permission.php @@ -65,6 +65,6 @@ class Permission extends LaratrustPermission $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } } diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php index f45c9de01..ebb4a1297 100644 --- a/app/Models/Auth/Role.php +++ b/app/Models/Auth/Role.php @@ -64,6 +64,6 @@ class Role extends LaratrustRole $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } } diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index d9ddabf01..0a985bbc5 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -177,7 +177,7 @@ class User extends Authenticatable $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } /**