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/6adee814
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6adee814
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6adee814

Branch: refs/heads/trunk
Commit: 6adee814fc2d1add80221d3a08aa994d484751ff
Parents: b0af95f
Author: Oleg Nechiporenko <onechipore...@apache.org>
Authored: Mon Jul 6 18:03:56 2015 +0300
Committer: Oleg Nechiporenko <onechipore...@apache.org>
Committed: Mon Jul 6 20:16:06 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/6adee814/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 da65c99..364d1c5 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) {

Reply via email to