External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 10:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Move license checking logic to /api/v2/config

Browse Source 
Use license_info.features.ldap & license_info.feature.enterprise_auth from /api/v2/config for
auth providers button enabling instead of using info from /api/v2/settings/all

Signed-off-by: Julen Landa Alustiza <julen@zokormazo.info>
This commit is contained in:
Julen Landa Alustiza
2017-09-19 11:27:27 +02:00
parent 6b7126ab6b
commit 9c2cf6b7ca
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
View File

@@ -100,7 +100,7 @@ export default ['i18n', function(i18n) {
}, },
save: { save: {
ngClick: 'vm.formSave()', ngClick: 'vm.formSave()',
ngDisabled: "license_type !== 'enterprise' && license_type !== 'open' || configuration_ldap_template_form.$invalid || configuration_ldap_template_form.$pending" ngDisabled: "!ldap_auth || configuration_ldap_template_form.$invalid || configuration_ldap_template_form.$pending"
} }
} }
}; };

2
awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
View File

@@ -39,7 +39,7 @@ export default ['i18n', function(i18n) {
}, },
save: { save: {
ngClick: 'vm.formSave()', ngClick: 'vm.formSave()',
ngDisabled: "license_type !== 'enterprise' && license_type !== 'open' || configuration_radius_template_form.$invalid || configuration_radius_template_form.$pending" ngDisabled: "!enterprise_auth || configuration_radius_template_form.$invalid || configuration_radius_template_form.$pending"
} }
} }
}; };

2
awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
View File

@@ -92,7 +92,7 @@ export default ['i18n', function(i18n) {
}, },
save: { save: {
ngClick: 'vm.formSave()', ngClick: 'vm.formSave()',
ngDisabled: "license_type !== 'enterprise' && license_type !== 'open' || configuration_saml_template_form.$invalid || configuration_saml_template_form.$pending" ngDisabled: "!enterprise_auth || configuration_saml_template_form.$invalid || configuration_saml_template_form.$pending"
} }
} }
}; };

2
awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js
View File

@@ -52,7 +52,7 @@ export default ['i18n', function(i18n) {
}, },
save: { save: {
ngClick: 'vm.formSave()', ngClick: 'vm.formSave()',
ngDisabled: "license_type !== 'enterprise' && license_type !== 'open' || configuration_tacacs_template_form.$invalid || configuration_tacacs_template_form.$pending" ngDisabled: "!enterprise_auth || configuration_tacacs_template_form.$invalid || configuration_tacacs_template_form.$pending"
} }
} }
}; };

24
awx/ui/client/src/configuration/configuration.controller.js
View File

@@ -7,7 +7,7 @@
export default [ export default [
'$scope', '$rootScope', '$state', '$stateParams', '$timeout', '$q', 'Alert', '$scope', '$rootScope', '$state', '$stateParams', '$timeout', '$q', 'Alert',
'ConfigurationService', 'ConfigurationUtils', 'CreateDialog', 'CreateSelect2', 'i18n', 'ParseTypeChange', 'ProcessErrors', 'Store', 'ConfigurationService', 'ConfigurationUtils', 'CreateDialog', 'CreateSelect2', 'i18n', 'ParseTypeChange', 'ProcessErrors', 'Store',
'Wait', 'configDataResolve', 'ToJSON', 'Wait', 'configDataResolve', 'ToJSON', 'ConfigService',
//Form definitions //Form definitions
'configurationAzureForm', 'configurationAzureForm',
'configurationGithubForm', 'configurationGithubForm',
@@ -26,7 +26,7 @@ export default [
function( function(
$scope, $rootScope, $state, $stateParams, $timeout, $q, Alert, $scope, $rootScope, $state, $stateParams, $timeout, $q, Alert,
ConfigurationService, ConfigurationUtils, CreateDialog, CreateSelect2, i18n, ParseTypeChange, ProcessErrors, Store, ConfigurationService, ConfigurationUtils, CreateDialog, CreateSelect2, i18n, ParseTypeChange, ProcessErrors, Store,
Wait, configDataResolve, ToJSON, Wait, configDataResolve, ToJSON, ConfigService,
//Form definitions //Form definitions
configurationAzureForm, configurationAzureForm,
configurationGithubForm, configurationGithubForm,
@@ -94,13 +94,6 @@ export default [
} }
} else { } else {
if (key === "LICENSE") {
if (_.isEmpty(data[key])) {
$scope.license_type = "open";
} else {
$scope.license_type = data[key].license_type;
}
}
//handle nested objects //handle nested objects
if(ConfigurationUtils.isEmpty(data[key])) { if(ConfigurationUtils.isEmpty(data[key])) {
$scope[key] = '{}'; $scope[key] = '{}';
@@ -114,6 +107,19 @@ export default [
}); });
$scope.$broadcast('populated', data); $scope.$broadcast('populated', data);
}); });
ConfigService.getConfig()
.then(function(data) {
$scope.ldap_auth = data.license_info.features.ldap;
$scope.enterprise_auth = data.license_info.features.enterprise_auth;
})
.catch(function(data, status) {
ProcessErrors($scope, data, status, null,
{
hdr: i18n._('Error'),
msg: i18n._('There was an error getting config values: ') + status
}
);
});
}; };
populateFromApi(); populateFromApi();