ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject [2/2] ambari git commit: AMBARI-12295. Issue with config groups names (onechiporenko)
Date Mon, 06 Jul 2015 17:13:08 GMT
AMBARI-12295. Issue with config groups names (onechiporenko)


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

Branch: refs/heads/branch-2.1
Commit: e1e5f2ca07853bd8324896ad2f2b60ca93c47214
Parents: 42ec1cd
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Mon Jul 6 18:03:56 2015 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Mon Jul 6 20:03:46 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/views/common/configs/config_history_flow.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e1e5f2ca/ambari-web/app/views/common/configs/config_history_flow.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/config_history_flow.js b/ambari-web/app/views/common/configs/config_history_flow.js
index 7f80bdf..bd5a50b 100644
--- a/ambari-web/app/views/common/configs/config_history_flow.js
+++ b/ambari-web/app/views/common/configs/config_history_flow.js
@@ -102,13 +102,14 @@ App.ConfigHistoryFlowView = Em.View.extend({
     var allServiceVersions = App.ServiceConfigVersion.find().filterProperty('serviceName',
this.get('serviceName'));
     var groupName = this.get('controller.selectedConfigGroup.isDefault') ? 'default'
         : this.get('controller.selectedConfigGroup.name');
+    var groupId = this.get('controller.selectedConfigGroup.configGroupId');
 
     allServiceVersions.forEach(function (version) {
       version.set('isDisabled', !(version.get('groupName') === groupName));
     }, this);
 
     var serviceVersions = allServiceVersions.filter(function(s) {
-      return s.get('groupName') == groupName || s.get('groupName') == 'default';
+      return (s.get('groupId') === groupId) || s.get('groupName') == 'default';
     });
 
     return serviceVersions.sort(function (a, b) {


Mime
View raw message