From d2a2c630706a92fd868380249cd0ac150396b3e3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 4 Aug 2025 22:25:23 +0100
Subject: [PATCH] Added dropdown menu for users

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Helpers/IconHelper.php                    |   1 +
 app/Providers/BreadcrumbsServiceProvider.php  |  10 ++
 resources/lang/en-US/general.php              |   2 +
 resources/views/layouts/default.blade.php     | 144 +++++++++++-------
 .../views/partials/bootstrap-table.blade.php  |   2 +-
 resources/views/users/index.blade.php         |   4 +
 6 files changed, 104 insertions(+), 59 deletions(-)

diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 7c8e2a74562a..b493732bee85 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -151,6 +151,7 @@ public static function icon($type) {
             case 'location':
                 return 'fas fa-map-marker-alt';
             case 'superadmin':
+            case 'admin':
                 return 'fas fa-crown';
             case 'print':
                 return 'fa-solid fa-print';
diff --git a/app/Providers/BreadcrumbsServiceProvider.php b/app/Providers/BreadcrumbsServiceProvider.php
index eda242fbe55c..1e7658a0433d 100644
--- a/app/Providers/BreadcrumbsServiceProvider.php
+++ b/app/Providers/BreadcrumbsServiceProvider.php
@@ -539,6 +539,16 @@ public function boot()
                 ->push(trans('general.users'), route('users.index'))
                 ->push(trans('general.deleted_users'), route('users.index'))
             );
+        } elseif ((request()->is('users*')) && (request()->admins=='true')) {
+            Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
+                ->push(trans('general.users'), route('users.index'))
+                ->push(trans('general.show_admins'), route('users.index'))
+            );
+        } elseif ((request()->is('users*')) && (request()->superadmins=='true')) {
+            Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
+                ->push(trans('general.users'), route('users.index'))
+                ->push(trans('general.show_superadmins'), route('users.index'))
+            );
         } else {
             Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
                 ->push(trans('general.users'), route('users.index'))
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 343c942ac0ac..b64a8b6b4bf1 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -552,6 +552,8 @@
     'phone'                   => 'Phone',
     'fax'                   => 'Fax',
     'contact'                   => 'Contact',
+    'show_admins' => 'Admin Users',
+    'show_superadmins' => 'Superusers',
     'edit_fieldset' => 'Edit fieldset fields and options',
     'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
     'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 95d1a67c2419..239534db3ce6 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -142,7 +142,7 @@
                     <div class="navbar-custom-menu">
                         <ul class="nav navbar-nav">
                             @can('index', \App\Models\Asset::class)
-                                <li aria-hidden="true"{!! (Request::is('hardware*') ? ' class="active"' : '') !!}>
+                                <li aria-hidden="true"{!! (request()->is('hardware*') ? ' class="active"' : '') !!}>
                                     <a href="{{ url('hardware') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=1" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.assets') }}">
                                         <x-icon type="assets" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.assets') }}</span>
@@ -150,7 +150,7 @@
                                 </li>
                             @endcan
                             @can('view', \App\Models\License::class)
-                                <li aria-hidden="true"{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
+                                <li aria-hidden="true"{!! (request()->is('licenses*') ? ' class="active"' : '') !!}>
                                     <a href="{{ route('licenses.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=2" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.licenses') }}">
                                         <x-icon type="licenses" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.licenses') }}</span>
@@ -158,7 +158,7 @@
                                 </li>
                             @endcan
                             @can('index', \App\Models\Accessory::class)
-                                <li aria-hidden="true"{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
+                                <li aria-hidden="true"{!! (request()->is('accessories*') ? ' class="active"' : '') !!}>
                                     <a href="{{ route('accessories.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=3" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.accessories') }}">
                                         <x-icon type="accessories" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.accessories') }}</span>
@@ -166,7 +166,7 @@
                                 </li>
                             @endcan
                             @can('index', \App\Models\Consumable::class)
-                                <li aria-hidden="true"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
+                                <li aria-hidden="true"{!! (request()->is('consumables*') ? ' class="active"' : '') !!}>
                                     <a href="{{ url('consumables') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=4" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.consumables') }}">
                                         <x-icon type="consumables" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.consumables') }}</span>
@@ -174,7 +174,7 @@
                                 </li>
                             @endcan
                             @can('view', \App\Models\Component::class)
-                                <li aria-hidden="true"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
+                                <li aria-hidden="true"{!! (request()->is('components*') ? ' class="active"' : '') !!}>
                                     <a href="{{ route('components.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=5" : ''}} tabindex="-1" data-tooltip="true" data-placement="bottom" data-title="{{ trans('general.components') }}">
                                         <x-icon type="components" class="fa-fw" />
                                         <span class="sr-only">{{ trans('general.components') }}</span>
@@ -213,7 +213,7 @@
                                     </a>
                                     <ul class="dropdown-menu">
                                         @can('create', \App\Models\Asset::class)
-                                            <li{!! (Request::is('hardware/create') ? ' class="active"' : '') !!}>
+                                            <li{!! (request()->is('hardware/create') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('hardware.create') }}" tabindex="-1">
                                                     <x-icon type="assets" />
                                                     {{ trans('general.asset') }}
@@ -221,7 +221,7 @@
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\License::class)
-                                            <li{!! (Request::is('licenses/create') ? ' class="active"' : '') !!}>
+                                            <li{!! (request()->is('licenses/create') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('licenses.create') }}" tabindex="-1">
                                                     <x-icon type="licenses" />
                                                     {{ trans('general.license') }}
@@ -229,7 +229,7 @@
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\Accessory::class)
-                                            <li {!! (Request::is('accessories/create') ? 'class="active"' : '') !!}>
+                                            <li {!! (request()->is('accessories/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('accessories.create') }}" tabindex="-1">
                                                     <x-icon type="accessories" />
                                                     {{ trans('general.accessory') }}
@@ -237,7 +237,7 @@
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\Consumable::class)
-                                            <li {!! (Request::is('consunmables/create') ? 'class="active"' : '') !!}>
+                                            <li {!! (request()->is('consunmables/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('consumables.create') }}" tabindex="-1">
                                                     <x-icon type="consumables" />
                                                     {{ trans('general.consumable') }}
@@ -245,7 +245,7 @@
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\Component::class)
-                                            <li {!! (Request::is('components/create') ? 'class="active"' : '') !!}>
+                                            <li {!! (request()->is('components/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('components.create') }}" tabindex="-1">
                                                     <x-icon type="components" />
                                                     {{ trans('general.component') }}
@@ -253,7 +253,7 @@
                                             </li>
                                         @endcan
                                         @can('create', \App\Models\User::class)
-                                            <li {!! (Request::is('users/create') ? 'class="active"' : '') !!}>
+                                            <li {!! (request()->is('users/create') ? 'class="active"' : '') !!}>
                                                 <a href="{{ route('users.create') }}" tabindex="-1">
                                                     <x-icon type="users" />
                                                     {{ trans('general.user') }}
@@ -345,21 +345,21 @@
                                     </a>
                                     <ul class="dropdown-menu">
                                         <!-- User image -->
-                                        <li {!! (Request::is('account/profile') ? ' class="active"' : '') !!}>
+                                        <li {!! (request()->is('account/profile') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('view-assets') }}">
                                                 <x-icon type="checkmark" class="fa-fw" />
                                                 {{ trans('general.viewassets') }}
                                             </a></li>
 
                                         @can('viewRequestable', \App\Models\Asset::class)
-                                            <li {!! (Request::is('account/requested') ? ' class="active"' : '') !!}>
+                                            <li {!! (request()->is('account/requested') ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('account.requested') }}">
                                                     <x-icon type="checkmark" class="fa-fw" />
                                                     {{ trans('general.requested_assets_menu') }}
                                                 </a></li>
                                         @endcan
 
-                                        <li {!! (Request::is('account/accept') ? ' class="active"' : '') !!}>
+                                        <li {!! (request()->is('account/accept') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('account.accept') }}">
                                                 <x-icon type="checkmark" class="fa-fw" />
                                                 {{ trans('general.accept_assets_menu') }}
@@ -447,7 +447,7 @@
                             </li>
                         @endcan
                         @can('index', \App\Models\Asset::class)
-                            <li class="treeview{{ ((Request::is('statuslabels/*') || Request::is('hardware*')) ? ' active' : '') }}">
+                            <li class="treeview{{ ((request()->is('statuslabels/*') || request()->is('hardware*')) ? ' active' : '') }}">
                                 <a href="#">
                                     <x-icon type="assets" class="fa-fw" />
                                     <span>{{ trans('general.assets') }}</span>
@@ -467,7 +467,7 @@
                                     <?php $status_navs = \App\Models\Statuslabel::where('show_in_nav', '=', 1)->withCount('assets as asset_count')->get(); ?>
                                     @if (count($status_navs) > 0)
                                         @foreach ($status_navs as $status_nav)
-                                            <li{!! (Request::is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}>
+                                            <li{!! (request()->is('statuslabels/'.$status_nav->id) ? ' class="active"' : '') !!}>
                                                 <a href="{{ route('statuslabels.show', ['statuslabel' => $status_nav->id]) }}">
                                                     <i class="fas fa-circle text-grey fa-fw"
                                                        aria-hidden="true"{!!  ($status_nav->color!='' ? ' style="color: '.e($status_nav->color).'"' : '') !!}></i>
@@ -526,7 +526,7 @@
                                     </li>
 
                                     @can('audit', \App\Models\Asset::class)
-                                        <li id="audit-due-sidenav-option"{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
+                                        <li id="audit-due-sidenav-option"{!! (request()->is('hardware/audit/due') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('assets.audit.due') }}">
                                                 <x-icon type="audit" class="text-yellow fa-fw"/>
                                                 {{ trans('general.audit_due') }}
@@ -536,7 +536,7 @@
                                     @endcan
 
                                     @can('checkin', \App\Models\Asset::class)
-                                    <li id="checkin-due-sidenav-option"{!! (Request::is('hardware/checkins/due') ? ' class="active"' : '') !!}>
+                                    <li id="checkin-due-sidenav-option"{!! (request()->is('hardware/checkins/due') ? ' class="active"' : '') !!}>
                                         <a href="{{ route('assets.checkins.due') }}">
                                             <x-icon type="due" class="text-orange fa-fw"/>
                                             {{ trans('general.checkin_due') }}
@@ -547,7 +547,7 @@
 
                                     <li class="divider">&nbsp;</li>
                                     @can('checkin', \App\Models\Asset::class)
-                                        <li{!! (Request::is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
+                                        <li{!! (request()->is('hardware/quickscancheckin') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('hardware/quickscancheckin') }}">
                                                 {{ trans('general.quickscan_checkin') }}
                                             </a>
@@ -555,12 +555,12 @@
                                     @endcan
 
                                     @can('checkout', \App\Models\Asset::class)
-                                        <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
+                                        <li{!! (request()->is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('hardware.bulkcheckout.show') }}">
                                                 {{ trans('general.bulk_checkout') }}
                                             </a>
                                         </li>
-                                        <li{!! (Request::is('hardware/requested') ? ' class="active"' : '') !!}>
+                                        <li{!! (request()->is('hardware/requested') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('assets.requested') }}">
                                                 {{ trans('general.requested') }}</a>
                                         </li>
@@ -572,21 +572,21 @@
                                                 {{ trans('general.deleted') }}
                                             </a>
                                         </li>
-                                        <li {!! (Request::is('maintenances') ? ' class="active"' : '') !!}>
+                                        <li {!! (request()->is('maintenances') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('maintenances.index') }}">
                                                 {{ trans('general.asset_maintenances') }}
                                             </a>
                                         </li>
                                     @endcan
                                     @can('admin')
-                                        <li id="import-history-sidenav-option" {!! (Request::is('hardware/history') ? ' class="active"' : '') !!}>
+                                        <li id="import-history-sidenav-option" {!! (request()->is('hardware/history') ? ' class="active"' : '') !!}>
                                             <a href="{{ url('hardware/history') }}">
                                                 {{ trans('general.import-history') }}
                                             </a>
                                         </li>
                                     @endcan
                                     @can('audit', \App\Models\Asset::class)
-                                        <li id="bulk-audit-sidenav-option" {!! (Request::is('hardware/bulkaudit') ? ' class="active"' : '') !!}>
+                                        <li id="bulk-audit-sidenav-option" {!! (request()->is('hardware/bulkaudit') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('assets.bulkaudit') }}">
                                                 {{ trans('general.bulkaudit') }}
                                             </a>
@@ -596,7 +596,7 @@
                             </li>
                         @endcan
                         @can('view', \App\Models\License::class)
-                            <li{!! (Request::is('licenses*') ? ' class="active"' : '') !!}>
+                            <li{!! (request()->is('licenses*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('licenses.index') }}">
                                     <x-icon type="licenses" class="fa-fw"/>
                                     <span>{{ trans('general.licenses') }}</span>
@@ -604,7 +604,7 @@
                             </li>
                         @endcan
                         @can('index', \App\Models\Accessory::class)
-                            <li id="accessories-sidenav-option"{!! (Request::is('accessories*') ? ' class="active"' : '') !!}>
+                            <li id="accessories-sidenav-option"{!! (request()->is('accessories*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('accessories.index') }}">
                                     <x-icon type="accessories" class="fa-fw" />
                                     <span>{{ trans('general.accessories') }}</span>
@@ -612,7 +612,7 @@
                             </li>
                         @endcan
                         @can('view', \App\Models\Consumable::class)
-                            <li id="consumables-sidenav-option"{!! (Request::is('consumables*') ? ' class="active"' : '') !!}>
+                            <li id="consumables-sidenav-option"{!! (request()->is('consumables*') ? ' class="active"' : '') !!}>
                                 <a href="{{ url('consumables') }}">
                                     <x-icon type="consumables" class="fa-fw" />
                                     <span>{{ trans('general.consumables') }}</span>
@@ -620,7 +620,7 @@
                             </li>
                         @endcan
                         @can('view', \App\Models\Component::class)
-                            <li id="components-sidenav-option"{!! (Request::is('components*') ? ' class="active"' : '') !!}>
+                            <li id="components-sidenav-option"{!! (request()->is('components*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('components.index') }}">
                                     <x-icon type="components" class="fa-fw" />
                                     <span>{{ trans('general.components') }}</span>
@@ -628,7 +628,7 @@
                             </li>
                         @endcan
                         @can('view', \App\Models\PredefinedKit::class)
-                            <li id="kits-sidenav-option"{!! (Request::is('kits') ? ' class="active"' : '') !!}>
+                            <li id="kits-sidenav-option"{!! (request()->is('kits') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('kits.index') }}">
                                     <x-icon type="kits" class="fa-fw" />
                                     <span>{{ trans('general.kits') }}</span>
@@ -637,15 +637,43 @@
                         @endcan
 
                         @can('view', \App\Models\User::class)
-                            <li id="users-sidenav-option"{!! (Request::is('users*') ? ' class="active"' : '') !!}>
-                                <a href="{{ route('users.index') }}" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}}>
-                                    <x-icon type="users" class="fa-fw" />
-                                    <span>{{ trans('general.people') }}</span>
-                                </a>
-                            </li>
+                                <li id="users-sidenav-option"{!! (request()->is('users*') ? ' class="active"' : '') !!}>
+                                    <a href="#" {{$snipeSettings->shortcuts_enabled == 1 ? "accesskey=6" : ''}}>
+                                        <x-icon type="users" class="fa-fw" />
+                                        <span>{{ trans('general.people') }}</span>
+                                        <x-icon type="angle-left" class="pull-right fa-fw"/>
+                                    </a>
+
+                                    <ul class="treeview-menu">
+                                        <li {!! ((request()->is('users')  && (request()->input() == null)) ? ' class="active"' : '') !!}>
+                                            <a href="{{ route('users.index') }}">
+                                                <x-icon type="circle" class="text-grey fa-fw"/>
+                                                {{ trans('general.list_all') }}
+                                            </a>
+                                        </li>
+                                        <li class="{{ (request()->is('users') && request()->input('superadmins') == "true") ? 'active' : '' }}">
+                                            <a href="{{ route('users.index', ['superadmins' => 'true']) }}">
+                                                <x-icon type="superadmin" class="text-danger"/>
+                                                {{ trans('general.show_superadmins') }}
+                                            </a>
+                                        </li>
+                                        <li class="{{ (request()->is('users') && request()->input('admins') == "true") ? 'active' : '' }}">
+                                            <a href="{{ route('users.index', ['admins' => 'true']) }}">
+                                                <x-icon type="admin" class="text-warning"/>
+                                                {{ trans('general.show_admins') }}
+                                            </a>
+                                        </li>
+                                        <li class="{{ (request()->is('users') && request()->input('status') == "deleted") ? 'active' : '' }}">
+                                            <a href="{{ route('users.index', ['status' => 'deleted']) }}">
+                                                <x-icon type="x" class="text-danger"/>
+                                                {{ trans('general.deleted_users') }}
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </li>
                         @endcan
                         @can('import')
-                            <li id="import-sidenav-option"{!! (Request::is('import*') ? ' class="active"' : '') !!}>
+                            <li id="import-sidenav-option"{!! (request()->is('import*') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('imports.index') }}">
                                     <x-icon type="import" class="fa-fw" />
                                     <span>{{ trans('general.import') }}</span>
@@ -663,7 +691,7 @@
 
                                 <ul class="treeview-menu">
                                     @if(Gate::allows('view', App\Models\CustomField::class) || Gate::allows('view', App\Models\CustomFieldset::class))
-                                        <li {!! (Request::is('fields*') ? ' class="active"' : '') !!}>
+                                        <li {!! (request()->is('fields*') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('fields.index') }}">
                                                 {{ trans('admin/custom_fields/general.custom_fields') }}
                                             </a>
@@ -671,7 +699,7 @@
                                     @endif
 
                                     @can('view', \App\Models\Statuslabel::class)
-                                        <li {!! (Request::is('statuslabels*') ? ' class="active"' : '') !!}>
+                                        <li {!! (request()->is('statuslabels*') ? ' class="active"' : '') !!}>
                                             <a href="{{ route('statuslabels.index') }}">
                                                 {{ trans('general.status_labels') }}
                                             </a>
@@ -679,7 +707,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\AssetModel::class)
-                                        <li {{!! (Request::is('models') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('models') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('models.index') }}">
                                                 {{ trans('general.asset_models') }}
                                             </a>
@@ -687,7 +715,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Category::class)
-                                        <li {{!! (Request::is('categories') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('categories') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('categories.index') }}">
                                                 {{ trans('general.categories') }}
                                             </a>
@@ -695,7 +723,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Manufacturer::class)
-                                        <li {{!! (Request::is('manufacturers') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('manufacturers') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('manufacturers.index') }}">
                                                 {{ trans('general.manufacturers') }}
                                             </a>
@@ -703,7 +731,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Supplier::class)
-                                        <li {{!! (Request::is('suppliers') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('suppliers') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('suppliers.index') }}">
                                                 {{ trans('general.suppliers') }}
                                             </a>
@@ -711,7 +739,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Department::class)
-                                        <li {{!! (Request::is('departments') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('departments') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('departments.index') }}">
                                                 {{ trans('general.departments') }}
                                             </a>
@@ -719,7 +747,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Location::class)
-                                        <li {{!! (Request::is('locations') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('locations') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('locations.index') }}">
                                                 {{ trans('general.locations') }}
                                             </a>
@@ -727,7 +755,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Company::class)
-                                        <li {{!! (Request::is('companies') ? ' class="active"' : '') !!}}>
+                                        <li {{!! (request()->is('companies') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('companies.index') }}">
                                                 {{ trans('general.companies') }}
                                             </a>
@@ -735,7 +763,7 @@
                                     @endcan
 
                                     @can('view', \App\Models\Depreciation::class)
-                                        <li  {{!! (Request::is('depreciations') ? ' class="active"' : '') !!}}>
+                                        <li  {{!! (request()->is('depreciations') ? ' class="active"' : '') !!}}>
                                             <a href="{{ route('depreciations.index') }}">
                                                 {{ trans('general.depreciation') }}
                                             </a>
@@ -746,7 +774,7 @@
                         @endcan
 
                         @can('reports.view')
-                            <li class="treeview{{ (Request::is('reports*') ? ' active' : '') }}">
+                            <li class="treeview{{ (request()->is('reports*') ? ' active' : '') }}">
                                 <a href="#" class="dropdown-toggle">
                                     <x-icon type="reports" class="fa-fw" />
                                     <span>{{ trans('general.reports') }}</span>
@@ -754,41 +782,41 @@
                                 </a>
 
                                 <ul class="treeview-menu">
-                                    <li {{!! (Request::is('reports/activity') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/activity') ? ' class="active"' : '') !!}}>
                                         <a href="{{ route('reports.activity') }}">
                                             {{ trans('general.activity_report') }}
                                         </a>
                                     </li>
-                                    <li {{!! (Request::is('reports/custom') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/custom') ? ' class="active"' : '') !!}}>
                                         <a href="{{ url('reports/custom') }}">
                                             {{ trans('general.custom_report') }}
                                         </a>
                                     </li>
-                                    <li {{!! (Request::is('reports/audit') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/audit') ? ' class="active"' : '') !!}}>
                                         <a href="{{ route('reports.audit') }}">
                                             {{ trans('general.audit_report') }}</a>
                                     </li>
-                                    <li {{!! (Request::is('reports/depreciation') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/depreciation') ? ' class="active"' : '') !!}}>
                                         <a href="{{ url('reports/depreciation') }}">
                                             {{ trans('general.depreciation_report') }}
                                         </a>
                                     </li>
-                                    <li {{!! (Request::is('reports/licenses') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/licenses') ? ' class="active"' : '') !!}}>
                                         <a href="{{ url('reports/licenses') }}">
                                             {{ trans('general.license_report') }}
                                         </a>
                                     </li>
-                                    <li {{!! (Request::is('reports/asset_maintenances') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/asset_maintenances') ? ' class="active"' : '') !!}}>
                                         <a href="{{ url('reports/asset_maintenances') }}">
                                             {{ trans('general.asset_maintenance_report') }}
                                         </a>
                                     </li>
-                                    <li {{!! (Request::is('reports/unaccepted_assets') ? ' class="active"' : '') !!}}>
+                                    <li {{!! (request()->is('reports/unaccepted_assets') ? ' class="active"' : '') !!}}>
                                         <a href="{{ url('reports/unaccepted_assets') }}">
                                             {{ trans('general.unaccepted_asset_report') }}
                                         </a>
                                     </li>
-                                    <li  {{!! (Request::is('reports/accessories') ? ' class="active"' : '') !!}}>
+                                    <li  {{!! (request()->is('reports/accessories') ? ' class="active"' : '') !!}}>
                                         <a href="{{ url('reports/accessories') }}">
                                             {{ trans('general.accessory_report') }}
                                         </a>
@@ -798,7 +826,7 @@
                         @endcan
 
                         @can('viewRequestable', \App\Models\Asset::class)
-                            <li{!! (Request::is('account/requestable-assets') ? ' class="active"' : '') !!}>
+                            <li{!! (request()->is('account/requestable-assets') ? ' class="active"' : '') !!}>
                                 <a href="{{ route('requestable-assets') }}">
                                     <x-icon type="requestable" class="fa-fw" />
                                     <span>{{ trans('general.requestable_items') }}</span>
@@ -910,7 +938,7 @@
 
 
                     <!-- Content -->
-                    <div id="{!! (Request::is('*api*') ? 'app' : 'webui') !!}">
+                    <div id="{!! (request()->is('*api*') ? 'app' : 'webui') !!}">
                         @yield('content')
                     </div>
 
@@ -1272,7 +1300,7 @@ function addValue($element) {
 
         </script>
 
-        @if ((Session::get('topsearch')=='true') || (Request::is('/')))
+        @if ((Session::get('topsearch')=='true') || (request()->is('/')))
             <script nonce="{{ csrf_token() }}">
                 $("#tagSearch").focus();
             </script>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index b7f8d6dc4406..b74203948564 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1261,7 +1261,7 @@ function numberWithCommas(value) {
                 window.location.href = '{{ (request()->input('admins') == "true") ? route('users.index') : route('users.index', ['admins' => 'true']) }}';
             },
             attributes: {
-                title: 'Show only admins',
+                title: '{{ trans('general.show_admins') }}',
 
             }
         },
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index f43588f0d8e9..373acfff230a 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -4,6 +4,10 @@
 
     @if (request('status')=='deleted')
         {{ trans('general.deleted') }}
+    @elseif (request('admins')=='true')
+        {{ trans('general.show_admins') }}
+    @elseif (request('superadmins')=='true')
+        {{ trans('general.show_superadmins') }}
     @else
         {{ trans('general.current') }}
     @endif