Browse Source

AMBARI-3806 Cannot save Default configs when overridden config present. (atkach)

atkach 11 years ago
parent
commit
b01ba5c51f
1 changed files with 5 additions and 12 deletions
  1. 5 12
      ambari-web/app/controllers/main/service/info/configs.js

+ 5 - 12
ambari-web/app/controllers/main/service/info/configs.js

@@ -890,9 +890,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
       result.flag = this.doPUTClusterConfigurations();
       result.flag = this.doPUTClusterConfigurations();
     } else {
     } else {
       var overridenConfigs = [];
       var overridenConfigs = [];
+      var groupHosts = [];
       configs.filterProperty('isOverridden', true).forEach(function (config) {
       configs.filterProperty('isOverridden', true).forEach(function (config) {
         overridenConfigs = overridenConfigs.concat(config.get('overrides'));
         overridenConfigs = overridenConfigs.concat(config.get('overrides'));
       });
       });
+      selectedConfigGroup.get('hosts').forEach(function(hostName){
+        groupHosts.push({"host_name": hostName});
+      });
 
 
       this.putConfigGroupChanges({
       this.putConfigGroupChanges({
         ConfigGroup: {
         ConfigGroup: {
@@ -901,7 +905,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
           "group_name": selectedConfigGroup.get('name'),
           "group_name": selectedConfigGroup.get('name'),
           "tag": selectedConfigGroup.get('service.id'),
           "tag": selectedConfigGroup.get('service.id'),
           "description": selectedConfigGroup.get('description'),
           "description": selectedConfigGroup.get('description'),
-          "hosts": selectedConfigGroup.get('hosts'),
+          "hosts": groupHosts,
           "desired_configs": this.buildGroupDesiredConfigs(overridenConfigs)
           "desired_configs": this.buildGroupDesiredConfigs(overridenConfigs)
         }
         }
       });
       });
@@ -967,17 +971,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
       if (globalConfigs.someProperty('name', uiConfigProperty.name)) {
       if (globalConfigs.someProperty('name', uiConfigProperty.name)) {
         var modelGlobalConfig = globalConfigs.findProperty('name', uiConfigProperty.name);
         var modelGlobalConfig = globalConfigs.findProperty('name', uiConfigProperty.name);
         modelGlobalConfig.value = uiConfigProperty.value;
         modelGlobalConfig.value = uiConfigProperty.value;
-        var uiOverrides = uiConfigProperty.get('overrides');
-        if (uiOverrides != null && uiOverrides.get('length') > 0) {
-          modelGlobalConfig.overrides = {};
-          uiOverrides.forEach(function (uiOverride) {
-            var value = uiOverride.get('value');
-            modelGlobalConfig.overrides[value] = [];
-            uiOverride.get('selectedHostOptions').forEach(function (host) {
-              modelGlobalConfig.overrides[value].push(host);
-            });
-          });
-        }
       } else {
       } else {
         globalConfigs.pushObject({
         globalConfigs.pushObject({
           name: uiConfigProperty.name,
           name: uiConfigProperty.name,