From 736777e1e6e5befd4a91f20b71979c9e11be0a84 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 16 Mar 2023 22:48:20 -0700
Subject: [PATCH] Added email and username to merge user confirmation screen

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/confirm-merge.blade.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index f01846d324..840173ca37 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -39,6 +39,8 @@
                                     <tr>
                                         <th class="col-md-1"></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.assets') }}</th>
                                         <th class="col-md-5">{{ trans('general.accessories') }}</th>
@@ -55,10 +57,18 @@
 
                                             <td>
                                               <span {!! (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') !!}>
-                                                {{ $user->present()->fullName() }} ({{ $user->username }}) (#{{ $user->id }})
+                                                {{ $user->present()->fullName() }}
                                               </span>
                                                 {{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
                                             </td>
+                                            <td>
+                                                {{ $user->email }}
+
+                                            </td>
+                                            <td>
+                                                {{ $user->username }}
+                                            </td>
+
                                             <td>
                                                 @foreach ($user->groups as $group)
                                                     <a href=" {{ route('groups.update', $group->id) }}" class="label  label-default">