diff --git a/app/Http/Controllers/Superuser/RoleController.php b/app/Http/Controllers/Superuser/RoleController.php index 8719e70..ed84ef1 100644 --- a/app/Http/Controllers/Superuser/RoleController.php +++ b/app/Http/Controllers/Superuser/RoleController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Superuser; use App\Http\Controllers\Controller; +use App\Http\Requests\DataTableRequest; use App\Models\Permission; use App\Models\Role; use Illuminate\Database\Eloquent\Builder; @@ -33,17 +34,12 @@ class RoleController extends Controller } /** - * @param \Illuminate\Http\Request $request + * @param \App\Http\Requests\DataTableRequest $request * @return \Illuminate\Http\Response */ - public function paginate(Request $request) + public function paginate(DataTableRequest $request) { - $request->validate([ - 'search' => 'nullable|string', - 'per_page' => 'nullable|integer|max:1000', - 'order.key' => 'nullable|string', - 'order.dir' => 'nullable|in:asc,desc', - ]); + $request->validated(); return Role::where(function (Builder $query) use ($request) { $search = '%' . $request->search . '%'; diff --git a/app/Http/Controllers/Superuser/UserController.php b/app/Http/Controllers/Superuser/UserController.php index 0c9dd87..e0f3e11 100644 --- a/app/Http/Controllers/Superuser/UserController.php +++ b/app/Http/Controllers/Superuser/UserController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Superuser; use App\Http\Controllers\Controller; +use App\Http\Requests\DataTableRequest; use App\Models\Permission; use App\Models\Role; use App\Models\User; @@ -28,17 +29,12 @@ class UserController extends Controller } /** - * @param \Illuminate\Http\Request $request + * @param \App\Http\Requests\DataTableRequest $request * @return \Illuminate\Http\Response */ - public function paginate(Request $request) + public function paginate(DataTableRequest $request) { - $request->validate([ - 'search' => 'nullable|string', - 'per_page' => 'nullable|integer|max:1000', - 'order.key' => 'nullable|string', - 'order.dir' => 'nullable|in:asc,desc', - ]); + $request->validated(); return User::where(function (Builder $query) use ($request) { $search = '%' . $request->input('search') . '%';