From 3a356c6aabbef04cef22e20a1bb4e52c56957980 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Tue, 23 Sep 2014 11:19:50 -0400 Subject: [PATCH] Make sure the team add UI handles the no mailing case as well --- static/directives/team-view-add.html | 2 +- static/js/app.js | 2 +- static/js/controllers.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/static/directives/team-view-add.html b/static/directives/team-view-add.html index 841e07a42..9129c7031 100644 --- a/static/directives/team-view-add.html +++ b/static/directives/team-view-add.html @@ -7,7 +7,7 @@ auto-clear="true" allowed-entities="['user', 'robot']" pull-right="true" - allow-emails="true" + allow-emails="allowEmail" email-message="Press enter to invite the entered e-mail address to this team" ng-show="!addingMember">
diff --git a/static/js/app.js b/static/js/app.js index de9c28f04..f6c8be899 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -3951,7 +3951,7 @@ quayApp.directive('entitySearch', function () { 'clearValue': '=clearValue', // Whether e-mail addresses are allowed. - 'allowEmails': '@allowEmails', + 'allowEmails': '=allowEmails', 'emailMessage': '@emailMessage', // True if the menu should pull right. diff --git a/static/js/controllers.js b/static/js/controllers.js index 6dacc86ca..667807b52 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -2283,7 +2283,7 @@ function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, U loadOrganization(); } -function TeamViewCtrl($rootScope, $scope, $timeout, Restangular, ApiService, $routeParams) { +function TeamViewCtrl($rootScope, $scope, $timeout, Features, Restangular, ApiService, $routeParams) { var teamname = $routeParams.teamname; var orgname = $routeParams.orgname; @@ -2291,6 +2291,7 @@ function TeamViewCtrl($rootScope, $scope, $timeout, Restangular, ApiService, $ro $scope.teamname = teamname; $scope.addingMember = false; $scope.memberMap = null; + $scope.allowEmail = Features.MAILING; $rootScope.title = 'Loading...';