Repository: ambari Updated Branches: refs/heads/trunk ea41021d0 -> cec8e4b75
AMBARI-6804. After creating a config group, defining an override, and then saving it, the config page no longer loads (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cec8e4b7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cec8e4b7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cec8e4b7 Branch: refs/heads/trunk Commit: cec8e4b7586230fd33a612953243627f32229c17 Parents: ea41021 Author: Srimanth Gunturi <[email protected]> Authored: Fri Aug 8 18:20:43 2014 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Fri Aug 8 18:20:48 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/utils/config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cec8e4b7/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 78a5838..d3d9a14 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -930,11 +930,12 @@ App.config = Em.Object.create({ var fileName = this.getOriginalFileName(config.type); var serviceConfig = !!params.configKeyToConfigMap[fileName] ? params.configKeyToConfigMap[fileName][prop] : false; var hostOverrideValue = this.formatOverrideValue(serviceConfig, properties[prop]); + var hostOverrideIsFinal = !!(config.properties_attributes && config.properties_attributes.final && config.properties_attributes.final[prop]); if (serviceConfig) { // Value of this property is different for this host. if (!Em.get(serviceConfig, 'overrides')) Em.set(serviceConfig, 'overrides', []); console.log("loadServiceConfigGroupOverridesSuccess(): [" + group + "] OVERRODE(" + serviceConfig.name + "): " + serviceConfig.value + " -> " + hostOverrideValue); - serviceConfig.overrides.pushObject({value: hostOverrideValue, group: group, isFinal: config.properties_attributes.final[prop] || false }); + serviceConfig.overrides.pushObject({value: hostOverrideValue, group: group, isFinal: hostOverrideIsFinal}); } else { params.serviceConfigs.push(this.createCustomGroupConfig(prop, config, group)); }
