From 941582ac2ae6428b1dfb06b6b380c12795314354 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 18 Jun 2024 10:27:11 +0100
Subject: [PATCH] Properly scope archived based on settings

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/AssetModelsController.php | 2 +-
 resources/views/models/view.blade.php          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index e9d7e162a3..a2deb616b0 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -288,7 +288,7 @@ class AssetModelsController extends Controller
     public function show($modelId = null)
     {
         $this->authorize('view', AssetModel::class);
-        $model = AssetModel::withTrashed()->withCount('assets')->find($modelId);
+        $model = AssetModel::withTrashed()->find($modelId);
 
         if (isset($model->id)) {
             return view('models/view', compact('model'));
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 76d3322998..7192e1edae 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -42,8 +42,8 @@
                           <i class="fas fa-barcode fa-2x"></i>
                         </span>
                                     <span class="hidden-xs hidden-sm">
-                            {{ trans('general.assets') }}
-                                        {!! ($model->assets_count > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->assets_count).'</badge>' : '' !!}
+                                        {{ trans('general.assets') }}
+                                        {!! ($model->assets()->AssetsForShow()->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->assets()->AssetsForShow()->count()).'</badge>' : '' !!}
                         </span>
                     </a>
                 </li>