Repository: ambari Updated Branches: refs/heads/trunk 4da141ec6 -> f5b439bf5
AMBARI-6794 Final button disappeared for overriden value. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f5b439bf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f5b439bf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f5b439bf Branch: refs/heads/trunk Commit: f5b439bf55355f6e778da3ebd616020d2b14063d Parents: 4da141e Author: aBabiichuk <[email protected]> Authored: Fri Aug 8 21:22:17 2014 +0300 Committer: aBabiichuk <[email protected]> Committed: Fri Aug 8 21:22:17 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 4 +++- ambari-web/app/utils/config.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b439bf/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 7f27f2e..20b4222 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -861,9 +861,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ this.setValueForCheckBox(serviceConfigProperty); this.setValidator(serviceConfigProperty, serviceConfigsData); + this.setSupportsFinal(serviceConfigProperty); this.setValuesForOverrides(overrides, _serviceConfigProperty, serviceConfigProperty, defaultGroupSelected); this.setEditability(serviceConfigProperty, defaultGroupSelected); - this.setSupportsFinal(serviceConfigProperty); return serviceConfigProperty; }, @@ -1000,6 +1000,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ createNewSCP: function (override, _serviceConfigProperty, serviceConfigProperty, defaultGroupSelected) { var newSCP = App.ServiceConfigProperty.create(_serviceConfigProperty); newSCP.set('value', override.value); + newSCP.set('isFinal', override.isFinal); + newSCP.set('supportsFinal', serviceConfigProperty.get('supportsFinal')); newSCP.set('isOriginalSCP', false); // indicated this is overridden value, newSCP.set('parentSCP', serviceConfigProperty); if (App.supports.hostOverrides && defaultGroupSelected) { http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b439bf/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index f910510..78a5838 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -934,7 +934,7 @@ App.config = Em.Object.create({ // 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}); + serviceConfig.overrides.pushObject({value: hostOverrideValue, group: group, isFinal: config.properties_attributes.final[prop] || false }); } else { params.serviceConfigs.push(this.createCustomGroupConfig(prop, config, group)); }
