External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

conditionally disable forms based on license type (#6589)

Browse Source
This commit is contained in:
Jake McDermott
2017-06-13 14:16:35 -04:00
committed by GitHub
parent c0923729e2
commit 59cc15b0d4
5 changed files with 9 additions and 5 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

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

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

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

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

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

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

@@ -35,7 +35,8 @@ export default ['i18n', function(i18n) {
TACACSPLUS_AUTH_PROTOCOL: { TACACSPLUS_AUTH_PROTOCOL: {
type: 'select', type: 'select',
reset: 'TACACSPLUS_AUTH_PROTOCOL', reset: 'TACACSPLUS_AUTH_PROTOCOL',
ngOptions: 'protocol.label for protocol in TACACSPLUS_AUTH_PROTOCOL_options track by protocol.value' ngOptions: 'protocol.label for protocol in TACACSPLUS_AUTH_PROTOCOL_options track by protocol.value',
} }
}, },
@@ -50,7 +51,7 @@ export default ['i18n', function(i18n) {
}, },
save: { save: {
ngClick: 'vm.formSave()', ngClick: 'vm.formSave()',
ngDisabled: true ngDisabled: "license_type !== 'enterprise' || form.$invalid || form.$pending"
} }
} }
}; };

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

@@ -83,6 +83,9 @@ export default [
} }
} else { } else {
if (key === "LICENSE") {
$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] = '{}';