lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Removed extra sort

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-11-14 14:41:11 +00:00
parent 075e3503b1
commit a0b8483878
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/ReportsController.php
View file

@ -45,7 +45,7 @@ class ReportsController extends Controller
} }
if ($request->filled('action_type')) { 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')) { if ($request->filled('created_by')) {
@ -53,16 +53,16 @@ class ReportsController extends Controller
} }
if ($request->filled('action_source')) { 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')) { 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')) { if ($request->filled('uploads')) {
$actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc'); $actionlogs = $actionlogs->whereNotNull('filename');
} }
$allowed_columns = [ $allowed_columns = [
@ -94,7 +94,7 @@ class ReportsController extends Controller
$actionlogs->OrderByCreatedBy($order); $actionlogs->OrderByCreatedBy($order);
break; break;
default: 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); $actionlogs = $actionlogs->orderBy($sort, $order);
break; break;
} }