Skip to content

A free open source IT asset/license management system

Implemented the checkbox select2

snipe465a0cd60aaa
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index efcacaac01..8766269ce9 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -58,7 +58,7 @@
</td>
<td>
@foreach($fieldset->models as $model)
- <a href="{{ route('models.show', $model->id) }}" class="label label-default">{{ $model->name }}{{ ($model->model_number) ? ' ('.$model->model_number.')' : '' }}</a>
+ <a href="{{ route('models.show', $model->id) }}" class="label label-light label-normal-bold">{{ $model->name }}{{ ($model->model_number) ? ' ('.$model->model_number.')' : '' }}</a>
@endforeach
</td>
@@ -217,7 +217,7 @@
<td>{{ $field->element }}</td>
<td>
@foreach($field->fieldset as $fieldset)
- <a href="{{ route('fieldsets.show', $fieldset->id) }}" class="label label-default">{{ $fieldset->name }}</a>
+ <a href="{{ route('fieldsets.show', $fieldset->id) }}" class="label label-light label-normal-bold">{{ $fieldset->name }}</a>
@endforeach
</td>
<td>
diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 96d79721a2..a6e34aeaa5 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -41,68 +41,18 @@
<fieldset>
- <x-form.legend icon="warning" help_text="{{ (isset($all_users_count) && ($all_users_count < config('app.max_unpaginated_records'))) ? trans('general.add_users_to_group_help') : trans('admin/settings/general.too_many_users_to_show', ['count'=> $all_users_count, 'max' => config('app.max_unpaginated_records')]) }}">
+ <x-form.legend icon="warning" help_text="{{ trans('general.add_users_to_group_help') }}">
{{ trans('general.add_users_to_group') }}
</x-form.legend>
-<!-- this is a temp fix for the select2 not working inside modals -->
-
-
-
- <div class="form-group">
- <div class="col-md-12">
-
- @if(($all_users_count ) && ($all_users_count < config('app.max_unpaginated_records')))
-
- <!-- This hidden input will store the selected user IDs as a comma-separated string to avoid max_input_vars and max_multipart_body_parts php.ini issues -->
- <input type="hidden" name="users_to_sync" id="hidden_ids_box" class="form-control" value="{{ $associated_users->pluck('id')->implode(',') }}"/>
-
- <div class="addremove-multiselect">
- <div class="col-lg-5 col-sm-5 col-xs-12">
- <h4>{{ trans('general.available_users') }}</h4>
- <select id="available-select" class="multiselect available form-control" size="8" multiple="multiple">
- @foreach($unselected_users as $unselected_user)
- <option value="{{ $unselected_user->id }}" role="option">
- {{ $unselected_user->present()->fullName }} ({{ $unselected_user->username }})
- </option>
- @endforeach
- </select>
- <p class="help-block text-right">
- <x-icon type="users" />
- <span id="count_unselected_box">{{ count($unselected_users) }}</span>
- </p>
- </div>
-
- <div class="multiselect-controls col-lg-2 col-sm-2 col-xs-12">
- <br><br>
- <button type="button" id="rightall" class="rightall btn btn-sm btn-block btn-default" data-tooltip="true" title="{{ trans('general.add_all_users_to_group') }}"><i class="fa-solid fa-angles-right"></i></button>
- <button type="button" id="right" class="right btn btn-sm btn-block btn-default" data-tooltip="true" title="{{ trans('general.add_selected_users_to_group') }}"><i class="fa-solid fa-angle-right"></i></button>
- <button type="button" id="left" class="left btn btn-block btn-sm btn-default" data-tooltip="true" title="{{ trans('general.remove_selected_users_from_group') }}"><i class="fa-solid fa-angle-left"></i></button>
- <button type="button" id="leftall" class="leftall btn btn-sm btn-block btn-default" data-tooltip="true" title="{{ trans('general.remove_all_users_from_group') }}"><i class="fa-solid fa-angles-left"></i></button>
- </div>
-
- <div class="col-lg-5 col-sm-5 col-xs-12">
- <h4>{{ trans('general.users_to_add_to_group') }}</h4>
- <select id="selected-select" class="multiselect selected form-control" size="8" multiple="multiple">
- @foreach($associated_users as $associated_user)
- <option value="{{ $associated_user->id }}" aria-selected="true" selected="selected" role="option">
- {{ $associated_user->present()->fullName }} ({{ $associated_user->username }})
- </option>
- @endforeach
- </select>
- <p class="help-block text-right">
- <x-icon type="users" />
- <span id="count_selected_box"> {{ count($associated_users) }}</span>
- </p>
-
- </div>
-
- </div>
-
- </div>
-</div>
+ <x-input.select2-checkboxes-scrollbox
+ name="users_to_sync"
+ :label="trans('general.users_to_add_to_group')"
+ endpoint="users"
+ :selected="$associated_user_ids"
+ :compactSubmit="true"
+ />
</fieldset>
-@endif
<div class="col-md-12">
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 6bbd4baa05..6174989119 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -296,7 +296,7 @@
var colMap = {};
this.columns.forEach(c => colMap[c.field] = c.title);
var op = this.getAdvancedSearchOperator();
- var html = '<span class="label label-warning" style="font-size: 11px; margin-right:6px;display:inline-block;margin-bottom:6px;">' +
+ var html = '<span class="label label-warning" style="font-size: 12px; margin-right:6px;display:inline-block;margin-bottom:6px; padding: 4px;">' +
advancedSearchOperatorLabel + ': ' + (op === 'or' ? advancedSearchOrText : advancedSearchAndText) + '</span>';
Object.keys(filters).forEach(f => {
@@ -310,10 +310,10 @@
// jQuery.html() would then parse and execute).
var safeLabel = escapeAdvancedSearchValue(colMap[f] || f);
var safeField = escapeAdvancedSearchAttr(f);
- html += '<span class="label label-primary" style="font-size: 11px; margin-right:6px;display:inline-block;margin-bottom:6px;"><b>' +
+ html += '<span class="label label-primary" style="font-size: 12px; margin-right:6px;display:inline-block;margin-bottom:6px; padding: 4px;"><b>' +
safeLabel + ':</b> ' + escapeAdvancedSearchValue(filters[f]) +
' <a href="javascript:void(0)" class="snipe-advanced-search-tag-remove" data-field="' + safeField +
- '" style="color:#fff;margin-left:6px;text-decoration:none;">&times;</a></span>';
+ '" style="font-size: 12px; margin-right:6px;display:inline-block;color:#fff;text-decoration:none;">&times;</a></span>';
});
// "Clear all" pill: same shortcut as opening the modal and hitting
@@ -323,7 +323,7 @@
html += '<a href="javascript:void(0)" class="label label-danger snipe-advanced-search-tags-clear-all"' +
' title="' + safeClearAllLabel + '"' +
' aria-label="' + safeClearAllLabel + '"' +
- ' style="font-size: 11px; margin-right:6px; display:inline-block; margin-bottom:6px; color:#fff; text-decoration:none; cursor:pointer;">' +
+ ' style="font-size: 12px; margin-right:6px; display:inline-block; margin-bottom:6px; color:#fff; text-decoration:none; cursor:pointer; padding: 4px;">' +
'<i class="fas fa-trash" aria-hidden="true" style="margin-right:4px;"></i>' + safeClearAllLabel +
'</a>';
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9a65f813e0..d349f096c1 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -328,14 +328,49 @@
<x-form.row :label="trans('general.company')" name="company_ids" id="company_ids">
<x-slot:input>
@if ((Gate::allows('canEditAuthFields', $user)) && (\App\Models\Company::canManageUsersCompanies()))
- <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="company_ids[]" style="width: 100%" multiple='multiple'>
+ {{-- Prototype swap: select2-checkboxes skin for select2.
+ Behavior lives in the .js-select2-checkboxes init in
+ snipeit.js. data-select-all=1 lights up the "Select all /
+ Clear" row at the top of the dropdown; the companies
+ selectlist endpoint already opted in via
+ Helper::paginateCollectionOrAll. --}}
+ <select
+ class="js-select2-checkboxes"
+ data-endpoint="companies"
+ data-placeholder="{{ trans('general.select_company') }}"
+ data-count-label="{{ trans('general.checkbox_multiselect_count') }}"
+ data-select-all="1"
+ data-select-all-label="{{ trans('general.select_all') }}"
+ data-clear-all-label="{{ trans('admin/hardware/general.clear') }}"
+ name="company_ids[]"
+ style="width: 100%"
+ multiple='multiple'
+ >
{{-- selected reads from the company_user pivot only. The
legacy users.company_id scalar can lag behind (LDAP
sync, pre-observer rows, etc.) so we never fall
- back to it. --}}
- @foreach (old('company_ids', $user->companies->pluck('id')->toArray()) as $selectedCompanyId)
- <option value="{{ $selectedCompanyId }}" selected="selected" role="option" aria-selected="true">
- {{ \App\Models\Company::find($selectedCompanyId)?->name }}
+ back to it.
+
+ Pre-fetch the selected companies in one query (name +
+ tag_color) and emit data-tag-color on each option so
+ the chip-strip renders colored swatches on initial
+ page load without waiting for the user to interact. --}}
+ @php
+ $selectedCompanyIds = old('company_ids', $user->companies->pluck('id')->toArray());
+ $selectedCompanies = \App\Models\Company::whereIn('id', $selectedCompanyIds)
+ ->get(['id', 'name', 'tag_color'])
+ ->keyBy('id');
+ @endphp
+ @foreach ($selectedCompanyIds as $selectedCompanyId)
+ @php $company = $selectedCompanies->get($selectedCompanyId); @endphp
+ <option
+ value="{{ $selectedCompanyId }}"
+ selected="selected"
+ role="option"
+ aria-selected="true"
+ @if ($company?->tag_color) data-tag-color="{{ $company->tag_color }}" @endif
+ >
+ {{ $company?->name }}
</option>
@endforeach
</select>
@@ -578,42 +613,47 @@
@endif
<!-- Groups -->
- <x-form.row :label="trans('general.groups')" name="groups">
- <x-slot:input>
- @if ($groups->count())
- @if ((!Gate::allows('editableOnDemo') || (!Auth::user()->isSuperUser())))
+ @if ($groups->count())
+ @if ((!Gate::allows('editableOnDemo') || (!Auth::user()->isSuperUser())))
+ <x-form.row :label="trans('general.groups')" name="groups">
+ <x-slot:input>
@if (count($userGroups->keys()) > 0)
- <ul>
- @foreach ($groups as $id => $group)
- {!! ($userGroups->keys()->contains($id) ? '<li>'.e($group).'</li>' : '') !!}
+ {{-- Read-only chip strip. Same label-light pill
+ shape as the editable chips, no × button so
+ the user can see group memberships without
+ being able to change them. --}}
+ <div class="js-user-groups-readonly">
+ @foreach ($userGroups as $id => $groupName)
+ <span class="label label-light">{{ $groupName }}</span>
@endforeach
- </ul>
+ </div>
@endif
- <x-form.help name="groups-locked" icon="locked">
+ <x-form.help name="groups-locked" icon="locked">
{{ trans('admin/users/general.group_memberships_helpblock') }}
- </x-form.help>
- @else
- <select
- name="groups[]"
- size="{{ ($groups->count() > 25) ? '25' : '10' }}"
- aria-label="groups[]"
- id="groups[]"
- multiple="multiple"
- class="form-control">
- @foreach ($groups as $id => $group)
- <option value="{{ $id }}"
- {{ ($userGroups->keys()->contains($id) ? ' selected' : '') }}>
- {{ $group }}
- </option>
- @endforeach
- </select>
- <x-form.help name="groups-notes">{{ trans('admin/users/table.groupnotes') }}</x-form.help>
- @endif
- @else
+ </x-form.help>
+ </x-slot:input>
+ </x-form.row>
+ @else
+ {{-- Freestanding select2-checkboxes-scrollbox rather than
+ nested inside x-form.row: the component
+ renders its own col-md-3 label + col-md-8
+ input grid, which x-form.row's col-md-7
+ wrapper would collide with. --}}
+ <x-input.select2-checkboxes-scrollbox
+ name="groups"
+ :label="trans('general.groups')"
+ endpoint="groups"
+ :selected="$userGroups->keys()->all()"
+ :height="300"
+ />
+ @endif
+ @else
+ <x-form.row :label="trans('general.groups')" name="groups">
+ <x-slot:input>
<p>{{ trans('admin/users/table.nogroup') }} <code>{{ trans('admin/settings/general.admin_settings') }} <i class="fa fa-cogs"></i> > {{ trans('general.groups') }} <i class="fas fa-user-friends"></i></code> </p>
- @endif
- </x-slot:input>
- </x-form.row>
+ </x-slot:input>
+ </x-form.row>
+ @endif
</div>
</fieldset>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 536e0bf23e..a4c1e768c4 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -115,9 +115,9 @@
<x-data-row :label="trans('general.username')" copy_what="username">
@if ($user->isSuperUser())
- <span class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><x-icon type="superadmin" style="padding-right: 5px;"/>{{ $user->username }}</span>
+ <span class="label label-danger label-normal" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><x-icon type="superadmin" style="padding-right: 5px;"/>{{ $user->username }}</span>
@elseif ($user->hasAccess('admin'))
- <span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" style="padding-right: 5px;"/>{{ $user->username }}</span>
+ <span class="label label-warning label-normal" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" style="padding-right: 5px;"/>{{ $user->username }}</span>
@else
{{ $user->username }}
@endif
@@ -134,11 +134,7 @@
<x-data-row :label="trans('general.groups')" copy_what="groups">
@if ($user->groups->count() > 0)
@foreach ($user->groups as $group)
- @can('superadmin')
- <a href="{{ route('groups.show', $group->id) }}" class="label label-default">{{ $group->name }}</a>
- @else
- <span class="label label-default">{{ $group->name }}</span>
- @endcan
+ {!! $group->present()->formattedNameLink() !!}
@endforeach
@endif
@@ -149,11 +145,11 @@
<x-data-row :label="trans('general.permissions')">
@if ($user->isSuperUser())
- <span class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}">
+ <span class="label label-danger label-normal" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}">
<x-icon type="superadmin" style="padding-right: 5px;"/>{{ trans('general.superuser') }}
</span>
@elseif ($user->hasAccess('admin'))
- <span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}">
+ <span class="label label-warning label-normal" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}">
<x-icon type="superadmin" style="padding-right: 5px;"/>{{ trans('general.admin_user') }}
</span>
@elseif (!empty($effectivePermissionsBySection))