From 601d6e73773760e2b7aa41097e85f32be3595151 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 12 Nov 2025 16:25:08 -0800 Subject: [PATCH 1/2] fixes requestable models query --- app/Http/Controllers/ViewAssetsController.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 06a9d0ce41..159c4a7ff6 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -156,7 +156,20 @@ class ViewAssetsController extends Controller public function getRequestableIndex() : View { $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets(); - $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get(); + $onlyUnassignedDeployable = Setting::getSettings()->request_unassigned_deployable; + $models = AssetModel::with([ + 'category', + 'requests', + 'assets' => function ($q) { + $q->where('requestable', 1) + ->whereHas('assetstatus', fn ($s) => + $s->where('archived', 0) + ->where(fn ($s) => + $s->where('deployable', 1)->orWhere('pending', 1) + ) + ); + }, + ])->RequestableModels()->get(); return view('account/requestable-assets', compact('assets', 'models')); } From 5e48dd45b2463fc0dc6b1009675304b6d252c19e Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 12 Nov 2025 16:27:04 -0800 Subject: [PATCH 2/2] remove unnecessary code --- app/Http/Controllers/ViewAssetsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 159c4a7ff6..77920dadab 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -156,7 +156,6 @@ class ViewAssetsController extends Controller public function getRequestableIndex() : View { $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets(); - $onlyUnassignedDeployable = Setting::getSettings()->request_unassigned_deployable; $models = AssetModel::with([ 'category', 'requests',