DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-03-16 22:50:11 -07:00
parent 0ef8aba36f d8d7ed4465
commit 94a275f239
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,8 @@
<tr> <tr>
<th class="col-md-1"></th> <th class="col-md-1"></th>
<th class="col-md-6">{{ trans('general.name') }}</th> <th class="col-md-6">{{ trans('general.name') }}</th>
<th class="col-md-6">{{ trans('general.email') }}</th>
<th class="col-md-6">{{ trans('general.username') }}</th>
<th class="col-md-5">{{ trans('general.groups') }}</th> <th class="col-md-5">{{ trans('general.groups') }}</th>
<th class="col-md-5">{{ trans('general.assets') }}</th> <th class="col-md-5">{{ trans('general.assets') }}</th>
<th class="col-md-5">{{ trans('general.accessories') }}</th> <th class="col-md-5">{{ trans('general.accessories') }}</th>
@ -55,10 +57,18 @@
<td> <td>
<span {!! (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') !!}> <span {!! (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') !!}>
{{ $user->present()->fullName() }} ({{ $user->username }}) (#{{ $user->id }}) {{ $user->present()->fullName() }}
</span> </span>
{{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }} {{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
</td> </td>
<td>
{{ $user->email }}
</td>
<td>
{{ $user->username }}
</td>
<td> <td>
@foreach ($user->groups as $group) @foreach ($user->groups as $group)
<a href=" {{ route('groups.update', $group->id) }}" class="label label-default"> <a href=" {{ route('groups.update', $group->id) }}" class="label label-default">