Merge pull request #2045 from coreos-inc/external-auth-email
Add external auth emails to entity search
This commit is contained in:
commit
7c40eb8d87
3 changed files with 11 additions and 0 deletions
|
@ -139,6 +139,7 @@ class EntitySearch(ApiResource):
|
|||
result = {
|
||||
'name': user.username,
|
||||
'kind': 'external',
|
||||
'title': user.email or '',
|
||||
'avatar': avatar.get_data_for_external_user(user)
|
||||
}
|
||||
return result
|
||||
|
|
|
@ -1157,6 +1157,12 @@ form input.ng-valid.ng-dirty,
|
|||
padding: 4px;
|
||||
}
|
||||
|
||||
.entity-mini-listing span.title {
|
||||
color: #aaa;
|
||||
font-size: 12px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.editable {
|
||||
position: relative;
|
||||
}
|
||||
|
|
|
@ -300,6 +300,10 @@ angular.module('quay').directive('entitySearch', function () {
|
|||
|
||||
template += '<span class="name">' + datum.value + '</span>';
|
||||
|
||||
if (datum.entity.title) {
|
||||
template += '<span class="title">' + datum.entity.title + '</span>';
|
||||
}
|
||||
|
||||
if (datum.entity.is_org_member === false && datum.entity.kind == 'user') {
|
||||
template += '<i class="fa fa-exclamation-triangle" title="User is outside the organization"></i>';
|
||||
}
|
||||
|
|
Reference in a new issue