AMBARI-15909. Alert help_url is not visible on the dash board (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d3fb6b6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d3fb6b6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d3fb6b6 Branch: refs/heads/trunk Commit: 2d3fb6b6babe682e928d01121c9fa8841adf771a Parents: 94c2329 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Apr 15 12:49:08 2016 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Apr 15 14:43:14 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/global/update_controller.js | 2 +- ambari-web/app/mappers/alert_definitions_mapper.js | 2 +- ambari-web/test/mappers/alert_definitions_mapper_test.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2d3fb6b6/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 e13fe41..62bab46 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/ambari-web/app/controllers/global/update_controller.js @@ -546,7 +546,7 @@ App.UpdateController = Em.Controller.extend({ var realUrl = '/alert_definitions?fields=' + 'AlertDefinition/component_name,AlertDefinition/description,AlertDefinition/enabled,AlertDefinition/repeat_tolerance,AlertDefinition/repeat_tolerance_enabled,' + 'AlertDefinition/id,AlertDefinition/ignore_host,AlertDefinition/interval,AlertDefinition/label,AlertDefinition/name,' + - 'AlertDefinition/scope,AlertDefinition/service_name,AlertDefinition/source'; + 'AlertDefinition/scope,AlertDefinition/service_name,AlertDefinition/source,AlertDefinition/help_url'; var url = this.getUrl(testUrl, realUrl); App.HttpClient.get(url, App.alertDefinitionsMapper, { http://git-wip-us.apache.org/repos/asf/ambari/blob/2d3fb6b6/ambari-web/app/mappers/alert_definitions_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/alert_definitions_mapper.js b/ambari-web/app/mappers/alert_definitions_mapper.js index 0b5e3a7..cd4e738 100644 --- a/ambari-web/app/mappers/alert_definitions_mapper.js +++ b/ambari-web/app/mappers/alert_definitions_mapper.js @@ -39,7 +39,7 @@ App.alertDefinitionsMapper = App.QuickDataMapper.create({ repeat_tolerance: 'AlertDefinition.repeat_tolerance', scope: 'AlertDefinition.scope', interval: 'AlertDefinition.interval', - helpUrl: 'AlertDefinition.help_url', + help_url: 'AlertDefinition.help_url', type: 'AlertDefinition.source.type', reporting_key: 'reporting', reporting_type: 'array', http://git-wip-us.apache.org/repos/asf/ambari/blob/2d3fb6b6/ambari-web/test/mappers/alert_definitions_mapper_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mappers/alert_definitions_mapper_test.js b/ambari-web/test/mappers/alert_definitions_mapper_test.js index 1c3ff60..5a8e214 100644 --- a/ambari-web/test/mappers/alert_definitions_mapper_test.js +++ b/ambari-web/test/mappers/alert_definitions_mapper_test.js @@ -198,7 +198,7 @@ describe('App.alertDefinitionsMapper', function () { "component_name" : "NAMENODE", "description" : "This service-level alert is triggered if the NN heap usage deviation has grown beyond the specified threshold within a given time interval.", "enabled" : true, - "help_url" : null, + "help_url" : "http://test.test";, "id" : 6, "ignore_host" : false, "interval" : 1, @@ -504,6 +504,7 @@ describe('App.alertDefinitionsMapper', function () { "scope" : "SERVICE", "service_name" : "HDFS", "component_name" : "NAMENODE", + "help_url" : "http://test.test"; } ];
