From 4a2a4d1b4cbc697ceaf4490a4236261551e7476b Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 28 Aug 2014 23:46:27 -0400 Subject: [PATCH] Add email invite support --- static/css/quay.css | 5 +++++ static/js/controllers.js | 8 +++++--- static/partials/team-view.html | 8 +++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/static/css/quay.css b/static/css/quay.css index 762efb1eb..d349d0eb1 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -4654,6 +4654,11 @@ i.quay-icon { display: inline-block; } +.member-listing .invite-listing { + margin-bottom: 10px; + display: inline-block; +} + .team-view .organization-header .popover { max-width: none !important; } diff --git a/static/js/controllers.js b/static/js/controllers.js index f65195346..dd9607f68 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -2288,7 +2288,9 @@ function TeamViewCtrl($rootScope, $scope, Restangular, ApiService, $routeParams) $scope.filterFunction = function(invited, robots) { return function(item) { - return item.is_robot == robots && item.invited == invited; + // Note: The !! is needed because is_robot will be undefined for invites. + var robot_check = (!!item.is_robot == robots); + return robot_check && item.invited == invited; }; }; @@ -2309,7 +2311,7 @@ function TeamViewCtrl($rootScope, $scope, Restangular, ApiService, $routeParams) ApiService.inviteTeamMemberEmail(null, params).then(function(resp) { $scope.members.push(resp); - $scope.memberMap[resp.name] = resp; + $scope.memberMap[resp.email] = resp; $scope.addingMember = false; }, errorHandler); }; @@ -2401,7 +2403,7 @@ function TeamViewCtrl($rootScope, $scope, Restangular, ApiService, $routeParams) $scope.memberMap = {}; for (var i = 0; i < $scope.members.length; ++i) { var current = $scope.members[i]; - $scope.memberMap[current.name] = current; + $scope.memberMap[current.name || current.email] = current; } return resp.members; diff --git a/static/partials/team-view.html b/static/partials/team-view.html index 32f94277b..da9031081 100644 --- a/static/partials/team-view.html +++ b/static/partials/team-view.html @@ -65,7 +65,13 @@ - + + + + + + {{ member.email }} +