DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13837 from snipe/features/add_employee_number_to_user_merge

Browse source 
Added employee number to user merge screen
This commit is contained in:
snipe 2023-11-03 20:10:05 +00:00 committed by GitHub
parent 8c316e0bd3 d0cc42a068
commit 92c7de3fb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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.email') }}</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-1 text-right">
<i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
@ -80,6 +81,9 @@
<td>
{{ $user->username }}
</td>
<td>
{{ $user->employee_num }}
</td>
<td>
@foreach ($user->groups as $group)