diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php index f01846d32..840173ca3 100644 --- a/resources/views/users/confirm-merge.blade.php +++ b/resources/views/users/confirm-merge.blade.php @@ -39,6 +39,8 @@ {{ trans('general.name') }} + {{ trans('general.email') }} + {{ trans('general.username') }} {{ trans('general.groups') }} {{ trans('general.assets') }} {{ trans('general.accessories') }} @@ -55,10 +57,18 @@ id==$user->id ? ' style="text-decoration: line-through"' : '') !!}> - {{ $user->present()->fullName() }} ({{ $user->username }}) (#{{ $user->id }}) + {{ $user->present()->fullName() }} {{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }} + + {{ $user->email }} + + + + {{ $user->username }} + + @foreach ($user->groups as $group)