#2608 Hotfix to make user admin page filtering work again

RaiderIO · Nov 17, 2024 · 90640b2 · 90640b2
1 parent f467878
commit 90640b2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -9,6 +9,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Teapot\StatusCode;
@@ -28,6 +29,7 @@ class Handler extends ExceptionHandler
         ModelNotFoundException::class,
         TokenMismatchException::class,
         ValidationException::class,
+        BadRequestException::class
     ];
 
     /**

diff --git a/app/Http/Controllers/Ajax/AjaxUserController.php b/app/Http/Controllers/Ajax/AjaxUserController.php
@@ -22,7 +22,10 @@ public function get(Request $request)
     {
         $users = User::with(['patreonUserLink', 'roles', 'dungeonroutes'])->selectRaw('users.*');
 
-        $datatablesResult = (new UsersDatatablesHandler($request))->setBuilder($users)->applyRequestToBuilder()->getResult();
+        $datatablesResult = (new UsersDatatablesHandler($request))
+            ->setBuilder($users)
+            ->applyRequestToBuilder()
+            ->getResult();
 
         foreach ($datatablesResult['data'] as $user) {
             /** @var $user User */

diff --git a/app/Logic/Datatables/DatatablesHandler.php b/app/Logic/Datatables/DatatablesHandler.php
@@ -17,7 +17,7 @@
 
 abstract class DatatablesHandler
 {
-    const VALID_COLUMN_NAMES = ['title', 'public_key'];
+    const VALID_COLUMN_NAMES = ['title', 'public_key', 'name', 'email'];
 
     protected Builder $builder;