Merge pull request #1244 from coreos-inc/enableaci
Add UI to the setup tool for enabling ACI conversion
This commit is contained in:
commit
11af123ba5
11 changed files with 106 additions and 18 deletions
|
@ -35,6 +35,10 @@ angular.module("core-config-setup", ['angularFileUpload'])
|
|||
return config.AUTHENTICATION_TYPE == 'Keystone';
|
||||
}, 'password': true},
|
||||
|
||||
{'id': 'signer', 'title': 'ACI Signing', 'condition': function(config) {
|
||||
return config.FEATURE_ACI_CONVERSION;
|
||||
}},
|
||||
|
||||
{'id': 'mail', 'title': 'E-mail Support', 'condition': function(config) {
|
||||
return config.FEATURE_MAILING;
|
||||
}},
|
||||
|
|
|
@ -12,7 +12,7 @@ angular.module('quay').directive('fetchTagDialog', function () {
|
|||
'repository': '=repository',
|
||||
'actionHandler': '=actionHandler'
|
||||
},
|
||||
controller: function($scope, $element, $timeout, ApiService, UserService, Config) {
|
||||
controller: function($scope, $element, $timeout, ApiService, UserService, Config, Features) {
|
||||
$scope.clearCounter = 0;
|
||||
$scope.currentFormat = null;
|
||||
$scope.currentEntity = null;
|
||||
|
@ -35,11 +35,13 @@ angular.module('quay').directive('fetchTagDialog', function () {
|
|||
});
|
||||
}
|
||||
|
||||
$scope.formats.push({
|
||||
'title': 'Rocket Fetch',
|
||||
'icon': 'rocket-icon',
|
||||
'command': 'rkt fetch {hostname}/{namespace}/{name}:{tag}'
|
||||
});
|
||||
if (Features.ACI_CONVERSION) {
|
||||
$scope.formats.push({
|
||||
'title': 'Rocket Fetch',
|
||||
'icon': 'rocket-icon',
|
||||
'command': 'rkt fetch {hostname}/{namespace}/{name}:{tag}'
|
||||
});
|
||||
}
|
||||
|
||||
$scope.formats.push({
|
||||
'title': 'Basic Docker Pull',
|
||||
|
|
Reference in a new issue