Repository: ambari Updated Branches: refs/heads/branch-2.5 f12088ca3 -> 34f1377fc
AMBARI-20693. Principal suffix field should be a non mandatory field in configure identities page of Enable kerberos wizard (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34f1377f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34f1377f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34f1377f Branch: refs/heads/branch-2.5 Commit: 34f1377fc13293eb1ded451d95d2a1c7e120b24c Parents: f12088c Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Apr 6 19:09:32 2017 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Apr 6 19:09:32 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/data/HDP2/kerberos_descriptor_properties.js | 5 +++++ ambari-web/app/mixins/wizard/addSecurityConfigs.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/34f1377f/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js b/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js index f6e4239..a6ecf20 100644 --- a/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js +++ b/ambari-web/app/data/HDP2/kerberos_descriptor_properties.js @@ -29,6 +29,11 @@ var properties = [ "name": "additional_realms", "index": 5, "placeholderText": "(" + Em.I18n.t("common.optional") + ")" + }, + { + "name": "principal_suffix", + "index": 6, + "placeholderText": "(" + Em.I18n.t("common.optional") + ")" } ]; http://git-wip-us.apache.org/repos/asf/ambari/blob/34f1377f/ambari-web/app/mixins/wizard/addSecurityConfigs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js b/ambari-web/app/mixins/wizard/addSecurityConfigs.js index 7e495ea..cc9fe5a 100644 --- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js +++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js @@ -216,7 +216,7 @@ App.AddSecurityConfigs = Em.Mixin.create({ for (var propertyName in kerberosProperties) { var predefinedProperty = this.get('kerberosDescriptorProperties').findProperty('name', propertyName); var value = kerberosProperties[propertyName]; - var isRequired = propertyName == 'additional_realms' ? false : value !== ""; + var isRequired = ['additional_realms', 'principal_suffix'].contains(propertyName) ? false : value !== ""; var propertyObject = { name: propertyName, value: value,
