From ccb5bc8f1b32d6fa1ac64ccb54e55771632293b4 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 8 Sep 2016 11:23:37 -0400 Subject: [PATCH] Add external auth emails to entity search Fixes #1791 --- endpoints/api/search.py | 1 + static/css/quay.css | 6 ++++++ static/js/directives/ui/entity-search.js | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/endpoints/api/search.py b/endpoints/api/search.py index b5d233f3b..8f0cc82b6 100644 --- a/endpoints/api/search.py +++ b/endpoints/api/search.py @@ -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 diff --git a/static/css/quay.css b/static/css/quay.css index 5cf7b92ee..8795187c8 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -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; } diff --git a/static/js/directives/ui/entity-search.js b/static/js/directives/ui/entity-search.js index c0be63673..ae80c19ed 100644 --- a/static/js/directives/ui/entity-search.js +++ b/static/js/directives/ui/entity-search.js @@ -300,6 +300,10 @@ angular.module('quay').directive('entitySearch', function () { template += '' + datum.value + ''; + if (datum.entity.title) { + template += '' + datum.entity.title + ''; + } + if (datum.entity.is_org_member === false && datum.entity.kind == 'user') { template += ''; }