You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/12/02 11:04:30 UTC
ambari git commit: AMBARI-14151 config comparison should not happen
for UI only configs. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 1e8d1e8b9 -> babcbf595
AMBARI-14151 config comparison should not happen for UI only configs. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/babcbf59
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/babcbf59
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/babcbf59
Branch: refs/heads/branch-2.1
Commit: babcbf5952bd2c0141f9a1eacf3b5bcf6223ce9a
Parents: 1e8d1e8
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Dec 2 11:22:54 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Dec 2 12:01:16 2015 +0200
----------------------------------------------------------------------
.../app/mixins/common/configs/configs_comparator.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/babcbf59/ambari-web/app/mixins/common/configs/configs_comparator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js
index de7bd77..f776e8c 100644
--- a/ambari-web/app/mixins/common/configs/configs_comparator.js
+++ b/ambari-web/app/mixins/common/configs/configs_comparator.js
@@ -142,13 +142,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);
}
},