Merge "Show Email Addresses when Searching"
This commit is contained in:
commit
b2ce9265fa
|
@ -67,7 +67,8 @@ angular.module('sb.search').factory('SearchHelper',
|
||||||
criteria.push(
|
criteria.push(
|
||||||
Criteria.create('User',
|
Criteria.create('User',
|
||||||
params.assignee_id,
|
params.assignee_id,
|
||||||
result.full_name)
|
result.full_name + ' <'
|
||||||
|
+ result.email + '>')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<td>{{user.full_name}}</td>
|
<td>{{user.full_name}}</td>
|
||||||
|
<td><{{user.email}}></td>
|
||||||
|
|
||||||
<td class="text-right">
|
<td class="text-right">
|
||||||
<span class="text-muted">Last Login:</span>
|
<span class="text-muted">Last Login:</span>
|
||||||
{{user.last_login | date: 'mediumDate'}}
|
{{user.last_login | date: 'mediumDate'}}
|
||||||
|
|
|
@ -70,7 +70,9 @@ angular.module('sb.services').factory('Search',
|
||||||
var userResults = [];
|
var userResults = [];
|
||||||
result.forEach(function (item) {
|
result.forEach(function (item) {
|
||||||
userResults.push(
|
userResults.push(
|
||||||
Criteria.create('user', item.id, item.full_name)
|
Criteria.create('user', item.id,
|
||||||
|
item.full_name,
|
||||||
|
item.email)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
deferred.resolve(userResults);
|
deferred.resolve(userResults);
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
<i class="fa fa-sync fa-spin"></i>
|
<i class="fa fa-sync fa-spin"></i>
|
||||||
</span>
|
</span>
|
||||||
<span ng-show="creator.full_name">
|
<span ng-show="creator.full_name">
|
||||||
{{creator.full_name}}
|
{{creator.full_name}} <{{creator.email}}>
|
||||||
</span>
|
</span>
|
||||||
<br/>
|
<br/>
|
||||||
<strong>Last updated:</strong>
|
<strong>Last updated:</strong>
|
||||||
|
|
|
@ -144,7 +144,7 @@ angular.module('sb.util').directive('userTypeahead',
|
||||||
*/
|
*/
|
||||||
$scope.formatUserName = function (model) {
|
$scope.formatUserName = function (model) {
|
||||||
if (!!model) {
|
if (!!model) {
|
||||||
return model.full_name;
|
return model.full_name + ' <' + model.email + '>';
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
};
|
};
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
ng-if="user && !user.$resolved"></i>
|
ng-if="user && !user.$resolved"></i>
|
||||||
|
|
||||||
|
|
||||||
<span ng-if="user && enabled">{{user.full_name}}</span>
|
<span ng-if="user && enabled">{{user.full_name}}
|
||||||
|
<{{user.email}}></span>
|
||||||
|
|
||||||
|
|
||||||
<a href=""
|
<a href=""
|
||||||
|
@ -48,7 +49,7 @@
|
||||||
ng-keypress="handleEnterKey($event)"
|
ng-keypress="handleEnterKey($event)"
|
||||||
typeahead-editable="false"
|
typeahead-editable="false"
|
||||||
typeahead-wait-ms="200"
|
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-loading="loadingUsers"
|
||||||
typeahead-input-formatter="formatUserName($model)"
|
typeahead-input-formatter="formatUserName($model)"
|
||||||
typeahead-on-select="updateViewValue($model.id);"
|
typeahead-on-select="updateViewValue($model.id);"
|
||||||
|
|
Loading…
Reference in New Issue