Merge "Show Email Addresses when Searching"

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 + '>')
                         );
                     }
                 );

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'}}

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);

src/app/stories/template/detail.html

@@ -99,7 +99,7 @@
             <i class="fa fa-sync 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>

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 '';
                 };

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);"