From cca52a1e70ef99b14e2ae7fbc66defaafed16e7d Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 17 Apr 2025 11:41:31 +0100 Subject: [PATCH] Use target *or* item Signed-off-by: snipe --- app/Http/Controllers/Api/ReportsController.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php index 494c75104f..d332cb7486 100644 --- a/app/Http/Controllers/Api/ReportsController.php +++ b/app/Http/Controllers/Api/ReportsController.php @@ -26,20 +26,18 @@ class ReportsController extends Controller $actionlogs = $actionlogs->TextSearch(e($request->input('search'))); } - if (($request->filled('target_type')) && ($request->filled('target_id'))) { - $actionlogs = $actionlogs->where('target_id', '=', $request->input('target_id')) - ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('target_type'))); - } - if (($request->filled('item_type')) && ($request->filled('item_id'))) { + if (($request->filled('target_type')) && ($request->filled('target_id')) + || + (($request->filled('item_type')) && ($request->filled('item_id')))) { $actionlogs = $actionlogs->where(function($query) use ($request) { $query->where('item_id', '=', $request->input('item_id')) - ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type'))) + ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('target_type'))) ->orWhere(function($query) use ($request) { - $query->where('target_id', '=', $request->input('item_id')) - ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('item_type'))); + $query->where('target_id', '=', $request->input('target_id')) + ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('target_type'))); }); }); }