From 72466f1aabbd07610e1c0513bdf8317b8c1acd3c Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 8 Sep 2025 15:04:28 +0100 Subject: [PATCH] Revert "Merge pull request #17823 from grokability/#17822-fix-n+1-in-topmenu" This reverts commit 6901deccbf14980885af66fec59ea06797814c3c, reversing changes made to 6b87c90e023f59434adb3d9678e9e4fe85874cb2. Signed-off-by: snipe --- app/Helpers/Helper.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index ba7e6fe9b4..5e954a24c5 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -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) {