ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiw...@apache.org
Subject git commit: AMBARI-7183. Configs: make filter by 'Changed properties' selected when comparing.(XIWANG)
Date Fri, 05 Sep 2014 23:54:15 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bc54512cf -> badfbce91


AMBARI-7183. Configs: make filter by 'Changed properties' selected when comparing.(XIWANG)


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

Branch: refs/heads/trunk
Commit: badfbce916a7349c5a1b4dc1f4e401e49ca16f16
Parents: bc54512
Author: Xi Wang <xiwang@apache.org>
Authored: Fri Sep 5 15:34:45 2014 -0700
Committer: Xi Wang <xiwang@apache.org>
Committed: Fri Sep 5 16:53:50 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/badfbce9/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 346bc48..2280d01 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -171,7 +171,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
           attributeName: filter.attributeName,
           attributeValue: filter.attributeValue,
           name: this.t(filter.caption),
-          selected: false
+          selected: filter.dependentOn ? this.get(filter.dependentOn) : false
         }));
       }
     }, this);
@@ -619,7 +619,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         serviceConfig.compareConfig.set('isFinal', compareConfig.isFinal);
         serviceConfig.compareConfig.set('value', App.config.formatOverrideValue(serviceConfig,
compareConfig.value));
         serviceConfig.isComparison = true;
-        serviceConfig.hasCompareDiffs = (serviceConfig.value !== serviceConfig.compareConfig.get('value'));
+        serviceConfig.hasCompareDiffs = (serviceConfig.value !== serviceConfig.compareConfig.get('value'))||
+          (serviceConfig.isFinal !== (serviceConfig.compareConfig.get('isFinal') == true));
       } else if (serviceConfig.isUserProperty) {
         compareObject.isMock = true;
         compareObject.displayType = 'label';


Mime
View raw message