vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add external auth emails to entity search

Browse source 
Fixes #1791
This commit is contained in:
Joseph Schorr 2016-09-08 11:23:37 -04:00
parent 934cdecbd6
commit ccb5bc8f1b
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
endpoints/api/search.py
View file

@ -139,6 +139,7 @@ class EntitySearch(ApiResource):
result = { result = {
'name': user.username, 'name': user.username,
'kind': 'external', 'kind': 'external',
'title': user.email or '',
'avatar': avatar.get_data_for_external_user(user) 'avatar': avatar.get_data_for_external_user(user)
} }
return result return result

6
static/css/quay.css
View file

@ -1157,6 +1157,12 @@ form input.ng-valid.ng-dirty,
padding: 4px; padding: 4px;
} }
.entity-mini-listing span.title {
color: #aaa;
font-size: 12px;
display: block;
}
.editable { .editable {
position: relative; position: relative;
} }

4
static/js/directives/ui/entity-search.js
View file

@ -300,6 +300,10 @@ angular.module('quay').directive('entitySearch', function () {
template += '<span class="name">' + datum.value + '</span>'; 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') { 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>'; template += '<i class="fa fa-exclamation-triangle" title="User is outside the organization"></i>';
} }