Browse Source

AMBARI-6278. ambari web does not save empty value properties in the configurations. (jaimin)

Jaimin Jetly 11 years ago
parent
commit
444bb8a992

+ 1 - 2
ambari-web/app/controllers/main/service/info/configs.js

@@ -1237,10 +1237,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
     //storedConfigs contains custom configs as well
     var serviceConfigProperties = configs.filterProperty('id', 'site property');
     this.formatConfigValues(serviceConfigProperties);
-    var storedConfigs = serviceConfigProperties.filterProperty('value');
     var mappedConfigs = App.config.excludeUnsupportedConfigs(this.get('configMapping').all(), App.Service.find().mapProperty('serviceName'));
     var allUiConfigs = this.loadUiSideConfigs(mappedConfigs);
-    this.set('uiConfigs', storedConfigs.concat(allUiConfigs));
+    this.set('uiConfigs', serviceConfigProperties.concat(allUiConfigs));
   },
 
   formatConfigValues: function(serviceConfigProperties){

+ 1 - 1
ambari-web/app/controllers/wizard.js

@@ -836,7 +836,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
           filename: _configProperties.get('filename'),
           displayType: _configProperties.get('displayType'),
           isRequiredByAgent: _configProperties.get('isRequiredByAgent'),
-          isCanBeEmpty: !!_configProperties.get('isCanBeEmpty') // flag that allow saving property with empty value
+          isRequired: _configProperties.get('isRequired') // flag that allow saving property with empty value
         };
         serviceConfigProperties.push(configProperty);
       }, this);

+ 1 - 4
ambari-web/app/controllers/wizard/step8_controller.js

@@ -346,12 +346,9 @@ App.WizardStep8Controller = Em.Controller.extend({
     serviceConfigProperties.forEach(function (_config) {
       _config.value = (typeof _config.value === "boolean") ? _config.value.toString() : _config.value;
     });
-    var storedConfigs = serviceConfigProperties.filter(function (configProperty) {
-      return !!configProperty.value || configProperty.isCanBeEmpty;
-    });
     var mappedConfigs = App.config.excludeUnsupportedConfigs(this.get('configMapping'), this.get('selectedServices').mapProperty('serviceName'));
     var uiConfigs = this.loadUiSideConfigs(mappedConfigs);
-    this.set('configs', storedConfigs.concat(uiConfigs));
+    this.set('configs', serviceConfigProperties.concat(uiConfigs));
   },
 
   /**

+ 0 - 1
ambari-web/app/data/HDP2/site_properties.js

@@ -1742,7 +1742,6 @@ module.exports =
       "isRequired": false,
       "displayType": "content",
       "serviceName": "FLUME",
-      "isCanBeEmpty": true,
       "category": "FlumeAgent",
       "filename": "flume-conf.xml"
     }