You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by zh...@apache.org on 2016/05/02 22:38:23 UTC
ambari git commit: AMBARI-16193 Message with "null" shows up in
showRestartRequiredPopup (zhewang)
Repository: ambari
Updated Branches:
refs/heads/trunk a5945c9f4 -> f8aecbba1
AMBARI-16193 Message with "null" shows up in showRestartRequiredPopup (zhewang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f8aecbba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8aecbba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8aecbba
Branch: refs/heads/trunk
Commit: f8aecbba123399c797fc9cc1d19c78e1bc8a5284
Parents: a5945c9
Author: Zhe (Joe) Wang <zh...@apache.org>
Authored: Mon May 2 13:37:49 2016 -0700
Committer: Zhe (Joe) Wang <zh...@apache.org>
Committed: Mon May 2 13:37:49 2016 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/global/update_controller.js | 2 +-
ambari-web/app/mappers/component_config_mapper.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8aecbba/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 223376b..47ec677 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -531,7 +531,7 @@ App.UpdateController = Em.Controller.extend({
},
updateComponentConfig: function (callback) {
var testUrl = '/data/services/host_component_stale_configs.json';
- var componentConfigUrl = this.getUrl(testUrl, '/components?host_components/HostRoles/stale_configs=true&fields=host_components/HostRoles/service_name,host_components/HostRoles/state,host_components/HostRoles/maintenance_state,host_components/HostRoles/host_name,host_components/HostRoles/stale_configs,host_components/HostRoles/desired_admin_state&minimal_response=true');
+ var componentConfigUrl = this.getUrl(testUrl, '/components?host_components/HostRoles/stale_configs=true&fields=host_components/HostRoles/display_name,host_components/HostRoles/service_name,host_components/HostRoles/state,host_components/HostRoles/maintenance_state,host_components/HostRoles/host_name,host_components/HostRoles/stale_configs,host_components/HostRoles/desired_admin_state&minimal_response=true');
App.HttpClient.get(componentConfigUrl, App.componentConfigMapper, {
complete: callback
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f8aecbba/ambari-web/app/mappers/component_config_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/component_config_mapper.js b/ambari-web/app/mappers/component_config_mapper.js
index 8ff3416..860730e 100644
--- a/ambari-web/app/mappers/component_config_mapper.js
+++ b/ambari-web/app/mappers/component_config_mapper.js
@@ -24,6 +24,7 @@ App.componentConfigMapper = App.QuickDataMapper.create({
work_status: 'HostRoles.state',
passive_state: 'HostRoles.maintenance_state',
component_name: 'HostRoles.component_name',
+ display_name: 'HostRoles.display_name',
host_name: 'HostRoles.host_name',
$ha_status: '',
$display_name_advanced: '',