Skip to content

A free open source IT asset/license management system

fixes requestable models query

Godfrey M601d6e737737
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'));
}