Merge pull request #2047 from coreos-inc/external-auth-email-optional

Make email addresses optional in external auth if email feature is turned off
This commit is contained in:
josephschorr 2016-10-31 14:16:33 -04:00 committed by GitHub
commit 840ea4e768
18 changed files with 206 additions and 93 deletions

View file

@ -10,7 +10,7 @@
})
}]);
function OrgViewCtrl($scope, $routeParams, $timeout, ApiService, UIService, AvatarService) {
function OrgViewCtrl($scope, $routeParams, $timeout, ApiService, UIService, AvatarService, Config, Features) {
var orgname = $routeParams.orgname;
$scope.namespace = orgname;
@ -22,6 +22,9 @@
$scope.changeEmailInfo = null;
$scope.context = {};
$scope.Config = Config;
$scope.Features = Features;
$scope.orgScope = {
'changingOrganization': false,
'organizationEmail': ''