From 59cc15b0d4bc6b7f49340524b2defb9a68a66857 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Tue, 13 Jun 2017 14:16:35 -0400 Subject: [PATCH] conditionally disable forms based on license type (#6589) --- .../src/configuration/auth-form/sub-forms/auth-ldap.form.js | 2 +- .../configuration/auth-form/sub-forms/auth-radius.form.js | 2 +- .../src/configuration/auth-form/sub-forms/auth-saml.form.js | 2 +- .../configuration/auth-form/sub-forms/auth-tacacs.form.js | 5 +++-- awx/ui/client/src/configuration/configuration.controller.js | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js index 3ae57a011d..96b3f2a55e 100644 --- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js +++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js @@ -99,7 +99,7 @@ export default ['i18n', function(i18n) { }, save: { ngClick: 'vm.formSave()', - ngDisabled: true + ngDisabled: "license_type !== 'enterprise' || form.$invalid || form.$pending" } } }; diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js index f8aa37b014..1e70fca7bb 100644 --- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js +++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js @@ -38,7 +38,7 @@ export default ['i18n', function(i18n) { }, save: { ngClick: 'vm.formSave()', - ngDisabled: true + ngDisabled: "license_type !== 'enterprise' || form.$invalid || form.$pending" } } }; diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js index 1a972f0aee..4273b1fc8b 100644 --- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js +++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js @@ -91,7 +91,7 @@ export default ['i18n', function(i18n) { }, save: { ngClick: 'vm.formSave()', - ngDisabled: true + ngDisabled: "license_type !== 'enterprise' || form.$invalid || form.$pending" } } }; diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js index c003b4fb3e..c5e29686e0 100644 --- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js +++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js @@ -35,7 +35,8 @@ export default ['i18n', function(i18n) { TACACSPLUS_AUTH_PROTOCOL: { type: 'select', 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: { ngClick: 'vm.formSave()', - ngDisabled: true + ngDisabled: "license_type !== 'enterprise' || form.$invalid || form.$pending" } } }; diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js index 65b5d1dfd7..b1d9063bc6 100644 --- a/awx/ui/client/src/configuration/configuration.controller.js +++ b/awx/ui/client/src/configuration/configuration.controller.js @@ -83,6 +83,9 @@ export default [ } } else { + if (key === "LICENSE") { + $scope.license_type = data[key].license_type; + } //handle nested objects if(ConfigurationUtils.isEmpty(data[key])) { $scope[key] = '{}';