ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #17823 from grokability/#17822-fix-n+1-in-topmenu"

Browse Source 
This reverts commit 6901deccbf, reversing
changes made to 6b87c90e02.

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2025-09-08 15:04:28 +01:00
parent 6901deccbf
commit 72466f1aab
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/Helper.php
+5 -7
View File
@@ -748,7 +748,7 @@ class Helper
$consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
$accessories = Accessory::withCount('checkouts as checkouts_count')->whereNotNull('min_amt')->get();
$components = Component::whereNotNull('min_amt')->get();
$asset_models = AssetModel::where('min_amt', '>', 0)->with('assets')->get();
$asset_models = AssetModel::where('min_amt', '>', 0)->get();
$licenses = License::where('min_amt', '>', 0)->get();
$items_array = [];
@@ -811,13 +811,11 @@ class Helper
}
}
foreach ($asset_models as $asset_model){
foreach ($asset_models as $asset_model) {
$total_owned = $asset_model->assets->count();
$avail = $asset_model->assets->whereNull('assets.assigned_to')->count();
$asset = new Asset();
$total_owned = $asset->where('model_id', '=', $asset_model->id)->count();
$avail = $asset->where('model_id', '=', $asset_model->id)->whereNull('assigned_to')->count();
if ($avail < ($asset_model->min_amt) + $alert_threshold) {
if ($avail > 0) {