Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit 7584c3072256 · 2024-07-11T12:00:25.000+01:00
diff --git a/app/Http/Middleware/AssetCountForSidebar.php b/app/Http/Middleware/AssetCountForSidebar.php
@@ -36,7 +36,7 @@ public function handle($request, Closure $next)
         try {
             $total_assets = Asset::count();
             if ($settings->show_archived_in_list != '1') {
-                $total_assets -= Asset::Archived()->count();
+                $total_assets = Asset::Archived()->count();
             }
             view()->share('total_assets', $total_assets);
         } catch (\Exception $e) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function handle($request, Closure $next)`
`36`	`36`	`try {`
`37`	`37`	`$total_assets = Asset::count();`
`38`	`38`	`if ($settings->show_archived_in_list != '1') {`
`39`		`- $total_assets -= Asset::Archived()->count();`
	`39`	`+ $total_assets = Asset::Archived()->count();`
`40`	`40`	`}`
`41`	`41`	`view()->share('total_assets', $total_assets);`
`42`	`42`	`} catch (\Exception $e) {`