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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
static/js/pages/org-view.js
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': ''

2
static/partials/new-organization.html
View file

@ -54,7 +54,7 @@
<span class="description">This will also be the namespace for your repositories. Must be alphanumeric, all lowercase and at least four characters long.</span>
</div>
<div class="form-group nested">
<div class="form-group nested" quay-require="['MAILING']">
<label for="orgName">Organization Email</label>
<div class="field-row">
<span class="field-container">

3
static/partials/org-view.html
View file

@ -106,7 +106,8 @@
<td>
<span class="avatar" size="48" data="organization.avatar"></span>
<div class="help-text" ng-if="Config.AVATAR_KIND == 'local'">Avatar is generated based off the organization's name.</div>
<div class="help-text" ng-if="Config.AVATAR_KIND == 'gravatar'">Avatar is served by <a href="http://gravatar.com" rel="nofollow" target="_blank">Gravatar</a> based on the {{ organization.email }} e-mail address.</div>
<div class="help-text" ng-if="Config.AVATAR_KIND == 'gravatar' && Features.MAILING">Avatar is served by <a href="http://gravatar.com" rel="nofollow" target="_blank">Gravatar</a> based on the {{ organization.email }} e-mail address.</div>
<div class="help-text" ng-if="Config.AVATAR_KIND == 'gravatar' && !Features.MAILING">Avatar is served by <a href="http://gravatar.com" rel="nofollow" target="_blank">Gravatar</a> based on the unique ID: {{ organization.email }}.</div>
</td>
</tr>
<tr quay-show="Features.MAILING">