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

- Add support for orgs in the entity search and the notification system

Browse source 
- Fix the titles/names of the different notification types
- Fix the styling of the options buttons on the notifications
This commit is contained in:
Joseph Schorr 2014-07-22 13:39:41 -04:00
parent 1ffbc77106
commit 54ee94754e
6 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
static/js/app.js
View file

@ -1015,7 +1015,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
},
{
'id': 'email',
'title': 'E-mail notification',
'title': 'E-mail',
'icon': 'fa-envelope',
'fields': [
{
@ -1027,7 +1027,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
},
{
'id': 'webhook',
'title': 'Webhook invoke',
'title': 'Webhook POST',
'icon': 'fa-link',
'fields': [
{
@ -3304,6 +3304,7 @@ quayApp.directive('entitySearch', function () {
$scope.includeTeams = true;
$scope.includeRobots = true;
$scope.includeOrgs = false;
$scope.currentEntityInternal = $scope.currentEntity;
@ -3436,6 +3437,9 @@ quayApp.directive('entitySearch', function () {
if ($scope.isOrganization && isSupported('team')) {
url += '&includeTeams=true'
}
if (isSupported('org')) {
url += '&includeOrgs=true'
}
return url;
},
filter: function(data) {
@ -3448,6 +3452,8 @@ quayApp.directive('entitySearch', function () {
found = entity.is_robot ? 'robot' : 'user';
} else if (entity.kind == 'team') {
found = 'team';
} else if (entity.kind == 'org') {
found = 'org';
}
if (!isSupported(found)) {
@ -3491,6 +3497,7 @@ quayApp.directive('entitySearch', function () {
var classes = [];
if (isSupported('user')) { classes.push('users'); }
if (isSupported('org')) { classes.push('organizations'); }
if ($scope.isAdmin && isSupported('robot')) { classes.push('robot accounts'); }
if ($scope.isOrganization && isSupported('team')) { classes.push('teams'); }
@ -3524,7 +3531,11 @@ quayApp.directive('entitySearch', function () {
template += '<i class="fa fa-wrench fa-lg"></i>';
} else if (datum.entity.kind == 'team') {
template += '<i class="fa fa-group fa-lg"></i>';
} else if (datum.entity.kind == 'org') {
template += '<i class="fa"><img src="//www.gravatar.com/avatar/' +
datum.entity.gravatar + '?s=16&amp;d=identicon"></i>';
}
template += '<span class="name">' + datum.value + '</span>';
if (datum.entity.is_org_member === false && datum.entity.kind == 'user') {