From a1ce9b928518e1c1e8fb1c374e8fe3a034c67746 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 10 Aug 2024 17:00:50 +0100 Subject: [PATCH] Added query scope for ordering by admin Signed-off-by: snipe --- app/Http/Controllers/Api/ReportsController.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index b0f64189d5..931886fb29 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -83,11 +83,19 @@ class ReportsController extends Controller $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value'); $limit = app('api_limit_value'); - $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; $order = ($request->input('order') == 'asc') ? 'asc' : 'desc'; + switch ($request->input('sort')) { + case 'admin': + $actionlogs->OrderAdmin($order); + break; + default: + $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; + $actionlogs = $actionlogs->orderBy($sort, $order); + break; + } - $actionlogs = $actionlogs->orderBy($sort, $order)->skip($offset)->take($limit)->get(); + $actionlogs = $actionlogs->skip($offset)->take($limit)->get(); return response()->json((new ActionlogsTransformer)->transformActionlogs($actionlogs, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE); }