DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-11-03 20:10:38 +00:00
parent 39c06802aa 92c7de3fb5
commit 9143b7a1b7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/users/confirm-merge.blade.php
View file

@ -48,6 +48,7 @@
<th class="col-md-3">{{ trans('general.name') }}</th> <th class="col-md-3">{{ trans('general.name') }}</th>
<th class="col-md-3">{{ trans('general.email') }}</th> <th class="col-md-3">{{ trans('general.email') }}</th>
<th class="col-md-3">{{ trans('general.username') }}</th> <th class="col-md-3">{{ trans('general.username') }}</th>
<th class="col-md-3">{{ trans('general.employee_number') }}</th>
<th class="col-md-3">{{ trans('general.groups') }}</th> <th class="col-md-3">{{ trans('general.groups') }}</th>
<th class="col-md-1 text-right"> <th class="col-md-1 text-right">
<i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i> <i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
@ -80,6 +81,9 @@
<td> <td>
{{ $user->username }} {{ $user->username }}
</td> </td>
<td>
{{ $user->employee_num }}
</td>
<td> <td>
@foreach ($user->groups as $group) @foreach ($user->groups as $group)