Skip to content

Added sidenav to filter on activated vs inactive users #17570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 1 commit into from
Aug 11, 2025
Merged

Added sidenav to filter on activated vs inactive users #17570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/Providers/BreadcrumbsServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,16 @@ public function boot()
->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'))
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en-US/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
'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',
Expand Down
28 changes: 20 additions & 8 deletions resources/views/layouts/default.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,30 +659,42 @@
</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
Expand Down
3 changes: 2 additions & 1 deletion resources/views/users/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ class="table table-striped snipe-table"
'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') }}",
Expand Down
Loading