Repository: ambari Updated Branches: refs/heads/trunk cb280b583 -> 067cc6223
AMBARI-15224. On Trunk, UI has missing names for components which have alert information associated with them (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/067cc622 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/067cc622 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/067cc622 Branch: refs/heads/trunk Commit: 067cc6223b0b7ff44c7c75485d12088821e89cc9 Parents: cb280b5 Author: Alex Antonenko <hiv...@gmail.com> Authored: Mon Feb 29 16:45:48 2016 +0200 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Mon Feb 29 16:45:48 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/global/update_controller.js | 1 + ambari-web/app/mappers/service_metrics_mapper.js | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/067cc622/ambari-web/app/controllers/global/update_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js index 72b3ca2..b1fa1cd 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/ambari-web/app/controllers/global/update_controller.js @@ -458,6 +458,7 @@ App.UpdateController = Em.Controller.extend({ realUrl = '/components/?' + flumeHandlerParam + atsHandlerParam + haComponents + 'ServiceComponentInfo/category=MASTER&fields=' + 'ServiceComponentInfo/service_name,' + + 'host_components/HostRoles/display_name,' + 'host_components/HostRoles/host_name,' + 'host_components/HostRoles/state,' + 'host_components/HostRoles/maintenance_state,' + http://git-wip-us.apache.org/repos/asf/ambari/blob/067cc622/ambari-web/app/mappers/service_metrics_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js index 80e86c6..a88c3e6 100644 --- a/ambari-web/app/mappers/service_metrics_mapper.js +++ b/ambari-web/app/mappers/service_metrics_mapper.js @@ -150,6 +150,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({ config3: { work_status: 'HostRoles.state', passive_state: 'HostRoles.maintenance_state', + display_name: 'HostRoles.display_name', component_name: 'HostRoles.component_name', host_id: 'HostRoles.host_name', host_name: 'HostRoles.host_name',