Repository: ambari Updated Branches: refs/heads/branch-2.2 ad71694e0 -> e7a15f411
AMBARI-15425 Required empty fields for AM (Grafana) are present after after upgrade from 2.2.0.0 etc to 2.2.2.0. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7a15f41 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7a15f41 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7a15f41 Branch: refs/heads/branch-2.2 Commit: e7a15f411649d6c4ef4bc046ec2d1e877ac45ed1 Parents: ad71694 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Tue Mar 15 17:22:16 2016 +0200 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Wed Mar 16 12:43:12 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/mixins/common/configs/enhanced_configs.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e7a15f41/ambari-web/app/mixins/common/configs/enhanced_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js index cd924d7..cb865b4 100644 --- a/ambari-web/app/mixins/common/configs/enhanced_configs.js +++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js @@ -577,10 +577,10 @@ App.EnhancedConfigsMixin = Em.Mixin.create({ var cp = configProperties.findProperty('name', propertyName); var stackProperty = stackConfigsMap[App.config.configId(propertyName, siteName)]; var attributes = properties[propertyName] || {}; + var fileName = App.config.getOriginalFileName(siteName); Em.keys(attributes).forEach(function (attributeName) { if (attributeName == 'delete' && cp) { if (!updateOnlyBoundaries) { - var fileName = App.config.getOriginalFileName(siteName); var modifiedFileNames = self.get('modifiedFileNames'); var dependentProperty = self.get('_dependentConfigValues').filterProperty('propertyName', propertyName).filterProperty('fileName', siteName).findProperty('configGroup', group && Em.get(group,'name')); if (dependentProperty) { @@ -625,6 +625,12 @@ App.EnhancedConfigsMixin = Em.Mixin.create({ } } else { Em.set(stackProperty.get('valueAttributes'), attributeName, attributes[attributeName]); + if (attributeName === 'visible') { + var p = self.findConfigProperty(propertyName, fileName); + if (p) { + p.set('isVisible', attributes[attributeName]); + } + } } } });
