From 1b8516cb867918586ae4ecddac14e987cd3f0604 Mon Sep 17 00:00:00 2001
From: Kendall Nelson <kennelson11@gmail.com>
Date: Tue, 7 Aug 2018 15:08:25 -0700
Subject: [PATCH] Show Email Addresses when Searching

Its hard to tell users apart when they have the same name,
to help users distinguish who is who when searching, this
patch enables the search helper to show both the name and email.

Change-Id: I8f783f7674a47b789636245c785cb9a9a26c4370
Story: 2000132
Task: 24370
---
 src/app/search/service/search_helper.js       | 3 ++-
 src/app/search/template/user_search_item.html | 2 ++
 src/app/services/resource/search.js           | 4 +++-
 src/app/stories/template/detail.html          | 2 +-
 src/app/util/directive/user_typeahead.js      | 2 +-
 src/app/util/template/user_typeahead.html     | 5 +++--
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/search/service/search_helper.js b/src/app/search/service/search_helper.js
index 9bdade1b..317f30ff 100644
--- a/src/app/search/service/search_helper.js
+++ b/src/app/search/service/search_helper.js
@@ -67,7 +67,8 @@ angular.module('sb.search').factory('SearchHelper',
                         criteria.push(
                             Criteria.create('User',
                                             params.assignee_id,
-                                            result.full_name)
+                                            result.full_name + ' <'
+                                            + result.email + '>')
                         );
                     }
                 );
diff --git a/src/app/search/template/user_search_item.html b/src/app/search/template/user_search_item.html
index 65158699..e882d1e9 100644
--- a/src/app/search/template/user_search_item.html
+++ b/src/app/search/template/user_search_item.html
@@ -1,4 +1,6 @@
 <td>{{user.full_name}}</td>
+<td>&lt;{{user.email}}&gt;</td>
+
 <td class="text-right">
     <span class="text-muted">Last Login:</span>
     {{user.last_login | date: 'mediumDate'}}
diff --git a/src/app/services/resource/search.js b/src/app/services/resource/search.js
index 9bdf8467..25ead88a 100644
--- a/src/app/services/resource/search.js
+++ b/src/app/services/resource/search.js
@@ -70,7 +70,9 @@ angular.module('sb.services').factory('Search',
                         var userResults = [];
                         result.forEach(function (item) {
                             userResults.push(
-                                Criteria.create('user', item.id, item.full_name)
+                                Criteria.create('user', item.id,
+                                                item.full_name,
+                                                item.email)
                             );
                         });
                         deferred.resolve(userResults);
diff --git a/src/app/stories/template/detail.html b/src/app/stories/template/detail.html
index 217aa3a4..5304a565 100644
--- a/src/app/stories/template/detail.html
+++ b/src/app/stories/template/detail.html
@@ -91,7 +91,7 @@
             <i class="fa fa-refresh fa-spin"></i>
         </span>
         <span ng-show="creator.full_name">
-            {{creator.full_name}}
+            {{creator.full_name}} &lt;{{creator.email}}&gt;
         </span>
         <br/>
         <strong>Last updated:</strong>
diff --git a/src/app/util/directive/user_typeahead.js b/src/app/util/directive/user_typeahead.js
index 8531f473..426025f9 100644
--- a/src/app/util/directive/user_typeahead.js
+++ b/src/app/util/directive/user_typeahead.js
@@ -144,7 +144,7 @@ angular.module('sb.util').directive('userTypeahead',
                  */
                 $scope.formatUserName = function (model) {
                     if (!!model) {
-                        return model.full_name;
+                        return model.full_name + ' <' + model.email + '>';
                     }
                     return '';
                 };
diff --git a/src/app/util/template/user_typeahead.html b/src/app/util/template/user_typeahead.html
index fcbb309b..3b4aabbe 100644
--- a/src/app/util/template/user_typeahead.html
+++ b/src/app/util/template/user_typeahead.html
@@ -8,7 +8,8 @@
            ng-if="user && !user.$resolved"></i>
         &nbsp;
 
-        <span ng-if="user && enabled">{{user.full_name}}</span>
+        <span ng-if="user && enabled">{{user.full_name}}
+           &lt;{{user.email}}&gt;</span>
 
         &nbsp;
         <a href=""
@@ -48,7 +49,7 @@
            ng-keypress="handleEnterKey($event)"
            typeahead-editable="false"
            typeahead-wait-ms="200"
-           typeahead="user as user.full_name for user in searchUsers($viewValue)"
+           typeahead="user as formatUserName(user) + ' <' + user.email + '>' + for user in searchUsers($viewValue)"
            typeahead-loading="loadingUsers"
            typeahead-input-formatter="formatUserName($model)"
            typeahead-on-select="updateViewValue($model.id);"