ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [54/59] [abbrv] git commit: AMBARI-7154. Configs: compare strangeness: content for yarn-log4j and yarn-env are the same.(XIWANG)
Date Thu, 04 Sep 2014 22:36:33 GMT
AMBARI-7154. Configs: compare strangeness: content for yarn-log4j and yarn-env are the same.(XIWANG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd732e3d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd732e3d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd732e3d

Branch: refs/heads/branch-alerts-dev
Commit: fd732e3d0f5346802a58a665b57a14d673c729a5
Parents: 3016782
Author: Xi Wang <xiwang@apache.org>
Authored: Thu Sep 4 11:21:28 2014 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Thu Sep 4 13:00:08 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fd732e3d/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 663fb36..346bc48 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -574,7 +574,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         for (var prop in configuration.properties) {
           value += prop + '=' + configuration.properties[prop] + '\n';
         }
-        serviceVersionMap[configuration.type] = {
+        serviceVersionMap[configuration.type + '-' + configuration.type] = {
           name: configuration.type,
           value: value,
           type: configuration.type,
@@ -583,7 +583,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         };
       } else {
         for (var prop in configuration.properties) {
-          serviceVersionMap[prop] = {
+          serviceVersionMap[prop + '-' + configuration.type] = {
             name: prop,
             value: configuration.properties[prop],
             type: configuration.type,
@@ -597,15 +597,15 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       }
       if (configuration.properties_attributes && configuration.properties_attributes.final)
{
         for (var final in configuration.properties_attributes.final) {
-          serviceVersionMap[final].isFinal = (configuration.properties_attributes.final[final]
=== 'true');
+          serviceVersionMap[final + '-' + configuration.type].isFinal = (configuration.properties_attributes.final[final]
=== 'true');
         }
       }
     }, this);
 
     allConfigs.forEach(function (serviceConfig) {
-      var compareConfig = serviceVersionMap[serviceConfig.name];
+      // map the property in the compare version to compare with current serviceConfig
+      var compareConfig = serviceVersionMap[serviceConfig.name + '-' + App.config.getConfigTagFromFileName(serviceConfig.filename)];
       var compareObject = $.extend(true, {isComparison: true}, serviceConfig);
-
       compareObject.serviceVersion = compareServiceVersion;
       compareObject.isEditable = false;
 


Mime
View raw message