Browse Source

AMBARI-4794. Reconfiguring memory related properties of a service suffixes 'm' to memory related properties of other service. (jaimin)

Jaimin Jetly 11 years ago
parent
commit
d0ccc47cc1
1 changed files with 8 additions and 1 deletions
  1. 8 1
      ambari-web/app/utils/config.js

+ 8 - 1
ambari-web/app/utils/config.js

@@ -251,7 +251,14 @@ App.config = Em.Object.create({
       properties = (properties.length) ? properties.objectAt(0).properties : {};
       for (var index in properties) {
         var configsPropertyDef =  null;
-        var preDefinedConfig = preDefinedConfigs.filterProperty('serviceName',serviceName).filterProperty('name', index);
+        var preDefinedConfig;
+        if (_tag.siteName === 'global') {
+        // Unlike other site where one site maps to ones service, global site contains configurations for multiple services
+        // So Global Configuration should not be filtered out with serviceName.
+          preDefinedConfig = preDefinedConfigs.filterProperty('name', index);
+        } else {
+          preDefinedConfig = preDefinedConfigs.filterProperty('serviceName',serviceName).filterProperty('name', index);
+        }
         preDefinedConfig.forEach(function(_preDefinedConfig){
           if (selectedServiceNames.contains(_preDefinedConfig.serviceName) || _preDefinedConfig.serviceName === 'MISC') {
             configsPropertyDef = _preDefinedConfig;