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

Make sure the team add UI handles the no mailing case as well

Browse source
This commit is contained in:
Joseph Schorr 2014-09-23 11:19:50 -04:00
parent f3b03ebc34
commit 3a356c6aab
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/directives/team-view-add.html
View file

@ -7,7 +7,7 @@
auto-clear="true" auto-clear="true"
allowed-entities="['user', 'robot']" allowed-entities="['user', 'robot']"
pull-right="true" pull-right="true"
allow-emails="true" allow-emails="allowEmail"
email-message="Press enter to invite the entered e-mail address to this team" email-message="Press enter to invite the entered e-mail address to this team"
ng-show="!addingMember"></div> ng-show="!addingMember"></div>
<div class="quay-spinner" ng-show="addingMember"></div> <div class="quay-spinner" ng-show="addingMember"></div>

2
static/js/app.js
View file

@ -3951,7 +3951,7 @@ quayApp.directive('entitySearch', function () {
'clearValue': '=clearValue', 'clearValue': '=clearValue',
// Whether e-mail addresses are allowed. // Whether e-mail addresses are allowed.
'allowEmails': '@allowEmails', 'allowEmails': '=allowEmails',
'emailMessage': '@emailMessage', 'emailMessage': '@emailMessage',
// True if the menu should pull right. // True if the menu should pull right.

3
static/js/controllers.js
View file

@ -2283,7 +2283,7 @@ function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, U
loadOrganization(); loadOrganization();
} }
function TeamViewCtrl($rootScope, $scope, $timeout, Restangular, ApiService, $routeParams) { function TeamViewCtrl($rootScope, $scope, $timeout, Features, Restangular, ApiService, $routeParams) {
var teamname = $routeParams.teamname; var teamname = $routeParams.teamname;
var orgname = $routeParams.orgname; var orgname = $routeParams.orgname;
@ -2291,6 +2291,7 @@ function TeamViewCtrl($rootScope, $scope, $timeout, Restangular, ApiService, $ro
$scope.teamname = teamname; $scope.teamname = teamname;
$scope.addingMember = false; $scope.addingMember = false;
$scope.memberMap = null; $scope.memberMap = null;
$scope.allowEmail = Features.MAILING;
$rootScope.title = 'Loading...'; $rootScope.title = 'Loading...';