ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sidenav to filter on activated vs inactive users

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2025-08-11 20:41:55 +01:00
parent 682baec0c9
commit 4038a22093
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Providers/BreadcrumbsServiceProvider.php
View File

@@ -549,6 +549,16 @@ class BreadcrumbsServiceProvider extends ServiceProvider
->push(trans('general.users'), route('users.index'))
->push(trans('general.show_superadmins'), route('users.index'))
);
} elseif ((request()->is('users*')) && (request()->activated=='0')) {
Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
->push(trans('general.users'), route('users.index'))
->push(trans('general.login_disabled'), route('users.index'))
);
} elseif ((request()->is('users*')) && (request()->activated=='1')) {
Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
->push(trans('general.users'), route('users.index'))
->push(trans('general.login_enabled'), route('users.index'))
);
} else {
Breadcrumbs::for('users.index', fn(Trail $trail) => $trail->parent('home', route('home'))
->push(trans('general.users'), route('users.index'))

1
resources/lang/en-US/general.php
View File

@@ -342,6 +342,7 @@ return [
'no_files_uploaded' => 'File upload success!',
'token_expired' => 'Your form session has expired. Please try again.',
'login_enabled' => 'Login Enabled',
'login_disabled' => 'Login Disabled',
'audit_due' => 'Due for Audit',
'audit_due_days' => '{}Assets Due or Overdue for Audit|[1]Assets Due or Overdue for Audit Within a Day|[2,*]Assets Due or Overdue for Audit Within :days Days',
'checkin_due' => 'Due for Checkin',

28
resources/views/layouts/default.blade.php
View File

@@ -659,30 +659,42 @@ dir="{{ Helper::determineLanguageDirection() }}">
</a>
<ul class="treeview-menu">
<li {!! ((request()->is('users') && (request()->input() == null)) ? ' class="active"' : '') !!}>
<li {!! ((request()->is('users') && (request()->input() == null)) ? ' class="active"' : '') !!} id="users-sidenav-list-all">
<a href="{{ route('users.index') }}">
<x-icon type="circle" class="text-grey fa-fw"/>
<x-icon type="circle" class="text-grey fa-fw fa-fw"/>
{{ trans('general.list_all') }}
</a>
</li>
<li class="{{ (request()->is('users') && request()->input('superadmins') == "true") ? 'active' : '' }}">
<li class="{{ (request()->is('users') && request()->input('superadmins') == "true") ? 'active' : '' }}" id="users-sidenav-superadmins">
<a href="{{ route('users.index', ['superadmins' => 'true']) }}">
<x-icon type="superadmin" class="text-danger"/>
<x-icon type="superadmin" class="text-danger fa-fw"/>
{{ trans('general.show_superadmins') }}
</a>
</li>
<li class="{{ (request()->is('users') && request()->input('admins') == "true") ? 'active' : '' }}">
<li class="{{ (request()->is('users') && request()->input('admins') == "true") ? 'active' : '' }}" id="users-sidenav-list-admins">
<a href="{{ route('users.index', ['admins' => 'true']) }}">
<x-icon type="admin" class="text-warning"/>
<x-icon type="admin" class="text-warning fa-fw"/>
{{ trans('general.show_admins') }}
</a>
</li>
<li class="{{ (request()->is('users') && request()->input('status') == "deleted") ? 'active' : '' }}">
<li class="{{ (request()->is('users') && request()->input('status') == "deleted") ? 'active' : '' }}" id="users-sidenav-deleted">
<a href="{{ route('users.index', ['status' => 'deleted']) }}">
<x-icon type="x" class="text-danger"/>
<x-icon type="x" class="text-danger fa-fw"/>
{{ trans('general.deleted_users') }}
</a>
</li>
<li class="{{ (request()->is('users') && request()->input('activated') == "1") ? 'active' : '' }}" id="users-sidenav-activated">
<a href="{{ route('users.index', ['activated' => true]) }}">
<i class="fa-solid fa-person-circle-check text-success fa-fw"></i>
{{ trans('general.login_enabled') }}
</a>
</li>
<li class="{{ (request()->is('users') && request()->input('activated') == "0") ? 'active' : '' }}" id="users-sidenav-not-activated">
<a href="{{ route('users.index', ['activated' => false]) }}">
<i class="fa-solid fa-person-circle-xmark text-danger fa-fw"></i>
{{ trans('general.login_disabled') }}
</a>
</li>
</ul>
</li>
@endcan

3
resources/views/users/index.blade.php
View File

@@ -53,7 +53,8 @@
'company_id' => e(request('company_id')),
'manager_id' => e(request('manager_id')),
'admins' => e(request('admins')),
'superadmins' => e(request('superadmins'))
'superadmins' => e(request('superadmins')),
'activated' => e(request('activated')),
]) }}"
data-export-options='{
"fileName": "export-users-{{ date('Y-m-d') }}",