Repository: ambari Updated Branches: refs/heads/branch-2.5 cb9cd6df5 -> 633e7b81d
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/633e7b81 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/633e7b81 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/633e7b81 Branch: refs/heads/branch-2.5 Commit: 633e7b81da13243b48d29c6680992d7c42ddfcc0 Parents: cb9cd6d Author: Richard Zang <[email protected]> Authored: Wed Feb 8 13:24:20 2017 -0800 Committer: Richard Zang <[email protected]> Committed: Wed Feb 8 14:36:18 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/633e7b81/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 ad44b9c..78873d7 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/633e7b81/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; }
