Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Middleware/AssetCountForSidebar.php

@@ -34,10 +34,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::AssetsForShow()->count();
             view()->share('total_assets', $total_assets);
         } catch (\Exception $e) {
             Log::debug($e);

resources/views/partials/bootstrap-table.blade.php

@@ -1698,7 +1698,7 @@ class: 'btn btn-primary',
                 window.location.href = '{{ (request()->input('status') == "deleted") ? route('models.index') : route('models.index', ['status' => 'deleted']) }}';
             },
             attributes: {
-                title: '{{ (request()->input('status') == "Deleted") ? trans('general.list_all') : trans('general.deleted') }}',
+                title: '{{ (request()->input('status') == "deleted") ? trans('general.list_all') : trans('general.deleted') }}',
 
             }
         },