diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index 1a86e5168..494c75104 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -45,7 +45,7 @@ class ReportsController extends Controller } if ($request->filled('action_type')) { - $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'))->orderBy('created_at', 'desc'); + $actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type')); } if ($request->filled('created_by')) { @@ -53,16 +53,16 @@ class ReportsController extends Controller } if ($request->filled('action_source')) { - $actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'))->orderBy('created_at', 'desc'); + $actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source')); } if ($request->filled('remote_ip')) { - $actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip'))->orderBy('created_at', 'desc'); + $actionlogs = $actionlogs->where('remote_ip', '=', $request->input('remote_ip')); } if ($request->filled('uploads')) { - $actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc'); + $actionlogs = $actionlogs->whereNotNull('filename'); } $allowed_columns = [ @@ -94,7 +94,7 @@ class ReportsController extends Controller $actionlogs->OrderByCreatedBy($order); break; default: - $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at'; + $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'action_logs.created_at'; $actionlogs = $actionlogs->orderBy($sort, $order); break; }