From 92ae06962942f985822f2ba888cfabbb70f74223 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:06:35 +0100 Subject: [PATCH 01/15] Disable button in UI if user cannot be deleted Signed-off-by: snipe --- resources/views/users/view.blade.php | 67 ++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 3dbd9ff531..7a9d0f5793 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -91,7 +91,7 @@ @if ($user->managedLocations()->count() >= 0 )
  • - +
    • @endif - @can('update', $user) + @if ($user->managesUsers()->count() >= 0 ) +
  • + + + +
    • + @endif + + + @can('update', $user)
  • @@ -114,7 +126,7 @@ @@ -221,11 +233,15 @@ @can('delete', $user) @if ($user->deleted_at=='')
    -
    - {{csrf_field()}} - {{ method_field("DELETE")}} - -
    + @if ($user->isDeletable()) +
    + {{csrf_field()}} + {{ method_field("DELETE")}} + +
    + @else + + @endif
    @@ -1014,7 +1030,7 @@
    -
    +
    @include('partials.locations-bulk-actions') @@ -1046,6 +1062,39 @@
    + +
    + + @include('partials.locations-bulk-actions') + + + +
    + +
    From 2b4a536f854d830c48fa1f8730294032c6cc895c Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:06:54 +0100 Subject: [PATCH 02/15] Added CSS for users, locations Signed-off-by: snipe --- public/css/build/app.css | Bin 24341 -> 24574 bytes public/css/build/overrides.css | Bin 17491 -> 17724 bytes public/css/dist/all.css | Bin 516964 -> 517430 bytes public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 9 +++++++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index e527c35aa0fb77d6a14203f16ea01c93ff8edf84..8f90c8128f832d4b5edd1b4563eea7456770b872 100644 GIT binary patch delta 59 zcmbQbkMZAr#tn@gJS7==$;HLGrNya5#gh$P)tHhECf{{)i( delta 14 WcmeyjpKizn)R>YDCO7EX^FzgR@{ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index ac39c8698b305f8e054a26625f3927e21d5ff681..18cee0a52233e0cc8c93e064beb800987f78dfef 100644 GIT binary patch delta 146 zcmaEIOn%!b`Gyw87N!>F7M2#)7Pc+yYh8FsGW3#*i*-wjQ;UkHKXhVOXEc~T@eI2? pKU5+oKRK}^Gd~X`r^;-cY`PsNds%GyrJ3x)+e4z+YYNFV0sylWHktqc delta 35 ocmdmXO8&_)`Gyw87N!>F7M2#)7Pc+yYhAWab7fcV0FhI~002)7NdN!< diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2798a8307f..66a79fdf01 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=ea5f3edebafdb29b616d23fa89106080", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=be3c0a217bc6c0e0744f75faed784887", - "/css/build/app.css": "/css/build/app.css?id=a168b0a799aa800ee926bffa1b1a434a", + "/css/build/overrides.css": "/css/build/overrides.css?id=ae6071a2aee6a6cacdfa2a14cc27fac0", + "/css/build/app.css": "/css/build/app.css?id=941bcfefadb4f55d7edeb366b51f573b", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=620b684d9dd9d3bb5fdda00a3a2467c3", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=6e9aa08b535262053b95aee495caa7df", + "/css/dist/all.css": "/css/dist/all.css?id=cb1d0d1f0f925e59cf79bdf088e09aa8", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=0141634c24336be626e05c8b77d1fa27", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 31e85ca26e..423728d5c0 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -649,6 +649,15 @@ th.css-accessory > .th-inner::before content: "\f11c"; font-family: "Font Awesome 5 Free"; font-weight: 400; } +th.css-users > .th-inner::before { + content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-weight: 400; +} + +th.css-location > .th-inner::before { + content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-weight: 400; +} + + .small-box .inner { padding-left: 15px; padding-right: 15px; From f769e8247f2740fa6708a20a65bd0279d7e7047d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:07:15 +0100 Subject: [PATCH 03/15] Added ManagedUsers method, additional checks in isDeletable() Signed-off-by: snipe --- app/Models/User.php | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index e535fa0fde..e30136703e 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -214,10 +214,12 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo public function isDeletable() { return Gate::allows('delete', $this) - && ($this->assets()->count() === 0) - && ($this->licenses()->count() === 0) - && ($this->consumables()->count() === 0) - && ($this->accessories()->count() === 0) + && ($this->assets->count() === 0) + && ($this->licenses->count() === 0) + && ($this->consumables->count() === 0) + && ($this->accessories->count() === 0) + && ($this->managedLocations->count() === 0) + && ($this->managesUsers->count() === 0) && ($this->deleted_at == ''); } @@ -410,6 +412,19 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo return $this->belongsTo(self::class, 'manager_id')->withTrashed(); } + /** + * Establishes the user -> managed users relationship + * + * @author A. Gianotto + * @since [v6.4.1] + * @return \Illuminate\Database\Eloquent\Relations\Relation + */ + public function managesUsers() + { + return $this->hasMany(\App\Models\User::class, 'manager_id'); + } + + /** * Establishes the user -> managed locations relationship * From 410b547f3c697b4a1ac9772820b644f21b2fa5dd Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:07:28 +0100 Subject: [PATCH 04/15] Added users and locatipon count to API Signed-off-by: snipe --- app/Http/Controllers/Api/UsersController.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index ba1a5366f6..66efb030ae 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -76,7 +76,7 @@ class UsersController extends Controller 'users.website', ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',) - ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count'); + ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_user_count', 'managedLocations as manages_location_count'); if ($request->filled('activated')) { @@ -187,6 +187,14 @@ class UsersController extends Controller $users->has('accessories', '=', $request->input('accessories_count')); } + if ($request->filled('manages_users_count')) { + $users->has('manages_users_count', '=', $request->input('manages_users_count')); + } + + if ($request->filled('manages_locations_count')) { + $users->has('manages_locations_count', '=', $request->input('manages_locations_count')); + } + if ($request->filled('autoassign_licenses')) { $users->where('autoassign_licenses', '=', $request->input('autoassign_licenses')); } @@ -244,6 +252,8 @@ class UsersController extends Controller 'licenses_count', 'consumables_count', 'accessories_count', + 'manages_user_count', + 'managed_locations_count', 'phone', 'address', 'city', From 482965197d513843403bd74c6cbd2965a7e729e1 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:07:41 +0100 Subject: [PATCH 05/15] Added users, locations to presenter, transformer Signed-off-by: snipe --- app/Http/Transformers/UsersTransformer.php | 2 ++ app/Presenters/UserPresenter.php | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index 0ebaca2692..5befc8abb6 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -64,6 +64,8 @@ class UsersTransformer 'licenses_count' => (int) $user->licenses_count, 'accessories_count' => (int) $user->accessories_count, 'consumables_count' => (int) $user->consumables_count, + 'manages_users_count' => (int) $user->manages_users_count, + 'manages_locations_count' => (int) $user->manages_locations_count, 'company' => ($user->company) ? ['id' => (int) $user->company->id, 'name'=> e($user->company->name)] : null, 'created_by' => ($user->createdBy) ? [ 'id' => (int) $user->createdBy->id, diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 4726205c72..600d6e5079 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -251,6 +251,24 @@ class UserPresenter extends Presenter 'title' => 'Accessories', 'visible' => true, ], + [ + 'field' => 'manages_users_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'class' => 'css-users', + 'title' => 'Managed Users', + 'visible' => true, + ], + [ + 'field' => 'manages_locations_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'class' => 'css-location', + 'title' => 'Managed Locations', + 'visible' => true, + ], [ 'field' => 'notes', 'searchable' => true, From 49dc9767b6f4078bcc2d155eb5f176c6ea79b085 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 15:54:43 +0100 Subject: [PATCH 06/15] Added debugging :( Signed-off-by: snipe --- app/Http/Controllers/Api/UsersController.php | 4 ++-- app/Http/Transformers/UsersTransformer.php | 5 +++++ public/css/build/app.css | Bin 24574 -> 24619 bytes public/css/build/overrides.css | Bin 17724 -> 17769 bytes public/css/dist/all.css | Bin 517430 -> 517520 bytes public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 6 +++--- resources/views/users/view.blade.php | 4 ++-- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 66efb030ae..ae8def0890 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -75,7 +75,7 @@ class UsersController extends Controller 'users.autoassign_licenses', 'users.website', - ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',) + ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy') ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_user_count', 'managedLocations as manages_location_count'); @@ -253,7 +253,7 @@ class UsersController extends Controller 'consumables_count', 'accessories_count', 'manages_user_count', - 'managed_locations_count', + 'manages_locations_count', 'phone', 'address', 'city', diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index 5befc8abb6..5ecc2ed6d8 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -21,6 +21,11 @@ class UsersTransformer public function transformUser(User $user) { + \Log::debug('users count: '.$user->manages_users_count); + \Log::debug('locations count: '.$user->manages_locations_count); + \Log::debug('users count method: '.$user->managesUsers()->count()); + \Log::debug('locations count method: '.$user->managedLocations()->count()); + \Log::debug('-----------'); $array = [ 'id' => (int) $user->id, 'avatar' => e($user->present()->gravatar), diff --git a/public/css/build/app.css b/public/css/build/app.css index 8f90c8128f832d4b5edd1b4563eea7456770b872..b478bebbe99ead5b8aa3683ce5b103bad2e8877a 100644 GIT binary patch delta 76 zcmeyjpKF7M2#)7Pc+y9~~u}T-`nW6g-{%{S-nRoqSvsJX{@JT!VtQ ze{f`1WacW)tV*>~Ff=Wwm@ebWp3MT{Pe1sUQIgr9pkn*HbL=z3wrj<(U(Ta~K>#7x BHUj_v delta 77 zcmbPmT7KIp`Gyw87N!>F7M2#)7Pc+yA04-IIk77+Pj_%(7n@#jjy(ay;@^JQl|8)` Ir_>ZN013t!iU0rr diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 66a79fdf01..f8707dfe02 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=ea5f3edebafdb29b616d23fa89106080", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=ae6071a2aee6a6cacdfa2a14cc27fac0", - "/css/build/app.css": "/css/build/app.css?id=941bcfefadb4f55d7edeb366b51f573b", + "/css/build/overrides.css": "/css/build/overrides.css?id=f27d47cadeee40c2b3ddd8b65ddafd65", + "/css/build/app.css": "/css/build/app.css?id=2f7abcd688deda0abb931c82c0d2a490", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=620b684d9dd9d3bb5fdda00a3a2467c3", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=cb1d0d1f0f925e59cf79bdf088e09aa8", + "/css/dist/all.css": "/css/dist/all.css?id=806674878c4c4d81a426203b30d90c98", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=0141634c24336be626e05c8b77d1fa27", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 423728d5c0..b92170d16b 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -621,6 +621,7 @@ th.css-padlock > .th-inner::before } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before @@ -643,18 +644,17 @@ th.css-envelope > .th-inner::before content: "\f0e0"; font-family: "Font Awesome 5 Free"; font-weight: 400; } - th.css-accessory > .th-inner::before { content: "\f11c"; font-family: "Font Awesome 5 Free"; font-weight: 400; } th.css-users > .th-inner::before { - content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-weight: 400; + content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-size: 15px; } th.css-location > .th-inner::before { - content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-weight: 400; + content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-size: 19px; margin-bottom: 0px; } diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 7a9d0f5793..225670c65d 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -89,7 +89,7 @@
    • - @if ($user->managedLocations()->count() >= 0 ) + @if ($user->managedLocations->count() >= 0 )
    • @endif - @if ($user->managesUsers()->count() >= 0 ) + @if ($user->managesUsers->count() >= 0 )
  • + From 386b2839e860e3e5de22154a02b804e3faf145c7 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 18:59:24 +0100 Subject: [PATCH 13/15] Added tests Signed-off-by: snipe --- tests/Feature/Api/Users/UsersDeleteTest.php | 42 +++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tests/Feature/Api/Users/UsersDeleteTest.php diff --git a/tests/Feature/Api/Users/UsersDeleteTest.php b/tests/Feature/Api/Users/UsersDeleteTest.php new file mode 100644 index 0000000000..cbdba83278 --- /dev/null +++ b/tests/Feature/Api/Users/UsersDeleteTest.php @@ -0,0 +1,42 @@ +create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + User::factory()->create(['first_name' => 'Lowly', 'last_name' => 'Worker', 'manager_id' => $manager->id]); + $this->actingAs(User::factory()->deleteUsers()->create())->assertFalse($manager->isDeletable()); + } + + public function testDisallowUserDeletionIfStillManagingLocations() + { + $manager = User::factory()->create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + Location::factory()->create(['manager_id' => $manager->id]); + $this->actingAs(User::factory()->deleteUsers()->create())->assertFalse($manager->isDeletable()); + } + + public function testAllowUserDeletionIfNotManagingLocations() + { + $manager = User::factory()->create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + $this->actingAs(User::factory()->deleteUsers()->create())->assertTrue($manager->isDeletable()); + } + + public function testDisallowUserDeletionIfNoDeletePermissions() + { + $manager = User::factory()->create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + Location::factory()->create(['manager_id' => $manager->id]); + $this->actingAs(User::factory()->editUsers()->create())->assertFalse($manager->isDeletable()); + } + + +} From 8c327e6523fe170606124b823abdcbe85e92b41a Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 19:16:56 +0100 Subject: [PATCH 14/15] Handle user not found properly Signed-off-by: snipe --- app/Http/Controllers/Api/UsersController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index f2f2f28b80..0faa541243 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -416,11 +416,14 @@ class UsersController extends Controller $this->authorize('view', User::class); $user = User::withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_users_count', 'managedLocations as manages_locations_count'); - $user = Company::scopeCompanyables($user)->find($id); - $this->authorize('view', $user); + if ($user = Company::scopeCompanyables($user)->find($id)) { + $this->authorize('view', $user); + return (new UsersTransformer)->transformUser($user); + } + + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id')))); - return (new UsersTransformer)->transformUser($user); } From b2a5d86e30c54a51d14b6c04658dd9ec09de6338 Mon Sep 17 00:00:00 2001 From: Tobias Regnery Date: Wed, 8 May 2024 09:34:35 +0200 Subject: [PATCH 15/15] Fixes #14701 - wrong total asset count The total asset count in the sidenav shows the ready to deploy count instead of the total count. Fix this by adjusting the query to all assets. Also respect the setting for archived assets. Add a default value for total assets, since we are now using the settings-variable, which is not available during the setup process. While at it, move the block for total assets before the ready to deploy assets to match the ordering of the sidenav. Signed-off-by: Tobias Regnery --- app/Http/Middleware/AssetCountForSidebar.php | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/Http/Middleware/AssetCountForSidebar.php b/app/Http/Middleware/AssetCountForSidebar.php index e529f75efa..9d81eca93f 100644 --- a/app/Http/Middleware/AssetCountForSidebar.php +++ b/app/Http/Middleware/AssetCountForSidebar.php @@ -21,25 +21,36 @@ class AssetCountForSidebar /** * This needs to be set for the /setup process, since the tables might not exist yet */ + $total_assets = 0; $total_due_for_checkin = 0; $total_overdue_for_checkin = 0; $total_due_for_audit = 0; $total_overdue_for_audit = 0; try { - $total_rtd_sidebar = Asset::RTD()->count(); - view()->share('total_rtd_sidebar', $total_rtd_sidebar); + $settings = Setting::getSettings(); + view()->share('settings', $settings); } catch (\Exception $e) { \Log::debug($e); } try { - $total_assets = Asset::RTD()->count(); + $total_assets = Asset::all()->count(); + if ($settings->show_archived_in_list != '1') { + $total_assets -= Asset::Archived()->count(); + } view()->share('total_assets', $total_assets); } catch (\Exception $e) { \Log::debug($e); } + try { + $total_rtd_sidebar = Asset::RTD()->count(); + view()->share('total_rtd_sidebar', $total_rtd_sidebar); + } catch (\Exception $e) { + \Log::debug($e); + } + try { $total_deployed_sidebar = Asset::Deployed()->count(); view()->share('total_deployed_sidebar', $total_deployed_sidebar); @@ -75,13 +86,6 @@ class AssetCountForSidebar \Log::debug($e); } - try { - $settings = Setting::getSettings(); - view()->share('settings', $settings); - } catch (\Exception $e) { - \Log::debug($e); - } - try { $total_due_for_audit = Asset::DueForAudit($settings)->count(); view()->share('total_due_for_audit', $total_due_for_audit);