Browse Source

AMBARI-14151 config comparison should not happen for UI only configs. (ababiichuk)

aBabiichuk 9 years ago
parent
commit
e33b1f7586
1 changed files with 8 additions and 4 deletions
  1. 8 4
      ambari-web/app/mixins/common/configs/configs_comparator.js

+ 8 - 4
ambari-web/app/mixins/common/configs/configs_comparator.js

@@ -139,13 +139,17 @@ App.ConfigsComparator = Em.Mixin.create({
 
     if (compareNonDefaultVersions) {
       allConfigs.forEach(function (serviceConfig) {
-        this.setCompareConfigs(serviceConfig, serviceVersionMap, compareVersionNumber, this.get('selectedVersion'));
+        if (Em.get(serviceConfig, 'isRequiredByAgent') !== false) {
+          this.setCompareConfigs(serviceConfig, serviceVersionMap, compareVersionNumber, this.get('selectedVersion'));
+        }
       }, this);
     } else {
       allConfigs.forEach(function (serviceConfig) {
-        var serviceCfgVersionMap = serviceVersionMap[this.get('compareServiceVersion').get('version')];
-        var compareConfig = serviceCfgVersionMap[serviceConfig.name + '-' + App.config.getConfigTagFromFileName(serviceConfig.filename)];
-        this.setCompareDefaultGroupConfig(serviceConfig, compareConfig);
+        if (Em.get(serviceConfig, 'isRequiredByAgent') !== false) {
+          var serviceCfgVersionMap = serviceVersionMap[this.get('compareServiceVersion').get('version')];
+          var compareConfig = serviceCfgVersionMap[serviceConfig.name + '-' + App.config.getConfigTagFromFileName(serviceConfig.filename)];
+          this.setCompareDefaultGroupConfig(serviceConfig, compareConfig);
+        }
       }, this);
     }
   },