You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2017/02/08 21:26:06 UTC
ambari git commit: AMBARI-19912 - Manage Config Group host list is
not sorted (rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 3568864a8 -> dea78b9d7
AMBARI-19912 - Manage Config Group host list is not sorted (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dea78b9d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dea78b9d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dea78b9d
Branch: refs/heads/trunk
Commit: dea78b9d77a3278c481677cbf5af10ce2bb754eb
Parents: 3568864
Author: Richard Zang <rz...@apache.org>
Authored: Wed Feb 8 13:24:20 2017 -0800
Committer: Richard Zang <rz...@apache.org>
Committed: Wed Feb 8 13:24:52 2017 -0800
----------------------------------------------------------------------
.../main/service/manage_config_groups_controller.js | 10 ++++++----
ambari-web/app/mappers/configs/config_groups_mapper.js | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dea78b9d/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 07756f0..4cf22d4 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -565,7 +565,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, {
var newHostsForParentGroup = parentGroupHosts.filter(function(hostName) {
return !selectedHosts.contains(hostName);
});
- group.get('hosts').pushObjects(selectedHosts);
+ group.set('hosts', group.get('hosts').pushObjects(selectedHosts).slice().sort());
group.set('parentConfigGroup.hosts', newHostsForParentGroup);
}
},
@@ -580,13 +580,15 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, {
}
var hosts = this.get('selectedHosts').slice();
var newHosts = [];
- this.get('selectedConfigGroup.parentConfigGroup.hosts').pushObjects(hosts);
- this.get('selectedConfigGroup.hosts').forEach(function(host) {
+ var selectedGroup = this.get('selectedConfigGroup');
+ var parentGroup = this.get('selectedConfigGroup.parentConfigGroup');
+ selectedGroup.get('hosts').forEach(function(host) {
if (!hosts.contains(host)) {
newHosts.pushObject(host);
}
});
- this.set('selectedConfigGroup.hosts', newHosts);
+ selectedGroup.set('hosts', newHosts);
+ parentGroup.set('hosts', parentGroup.get('hosts').pushObjects(hosts).slice().sort());
this.set('selectedHosts', []);
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/dea78b9d/ambari-web/app/mappers/configs/config_groups_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/configs/config_groups_mapper.js b/ambari-web/app/mappers/configs/config_groups_mapper.js
index 8700135..fe3d7a1 100644
--- a/ambari-web/app/mappers/configs/config_groups_mapper.js
+++ b/ambari-web/app/mappers/configs/config_groups_mapper.js
@@ -68,7 +68,7 @@ App.configGroupsMapper = App.QuickDataMapper.create({
configGroup.id = App.ServiceConfigGroup.groupId(configGroup.service_name, configGroup.group_name);
} else {
configGroup.id = App.ServiceConfigGroup.groupId(configGroup.ConfigGroup.tag, configGroup.ConfigGroup.group_name);
- configGroup.hosts = configGroup.ConfigGroup.hosts.mapProperty('host_name');
+ configGroup.hosts = configGroup.ConfigGroup.hosts.mapProperty('host_name').sort();
configGroup.service_name = configGroup.ConfigGroup.tag;
}