Repository: ambari Updated Branches: refs/heads/trunk df665c529 -> a6d89bede
AMBARI-15667. Alerts: Display support for alert messages with URLs (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6d89bed Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6d89bed Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6d89bed Branch: refs/heads/trunk Commit: a6d89bede6f3640fdca80959a70e14bc26eeff9a Parents: df665c5 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Apr 1 12:42:09 2016 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Apr 1 12:42:09 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/mappers/alert_definitions_mapper.js | 1 + ambari-web/app/models/alerts/alert_definition.js | 7 +++++++ ambari-web/app/templates/main/alerts/configs.hbs | 6 ++++++ 3 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a6d89bed/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 7aae518..0bf534e 100644 --- a/ambari-web/app/mappers/alert_definitions_mapper.js +++ b/ambari-web/app/mappers/alert_definitions_mapper.js @@ -36,6 +36,7 @@ App.alertDefinitionsMapper = App.QuickDataMapper.create({ enabled: 'AlertDefinition.enabled', scope: 'AlertDefinition.scope', interval: 'AlertDefinition.interval', + helpUrl: 'AlertDefinition.help_url', type: 'AlertDefinition.source.type', reporting_key: 'reporting', reporting_type: 'array', http://git-wip-us.apache.org/repos/asf/ambari/blob/a6d89bed/ambari-web/app/models/alerts/alert_definition.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/alerts/alert_definition.js b/ambari-web/app/models/alerts/alert_definition.js index 0acfc33..a730572 100644 --- a/ambari-web/app/models/alerts/alert_definition.js +++ b/ambari-web/app/models/alerts/alert_definition.js @@ -38,6 +38,7 @@ App.AlertDefinition = DS.Model.extend({ scope: DS.attr('string'), interval: DS.attr('number'), type: DS.attr('string'), + helpUrl: DS.attr('string'), groups: DS.hasMany('App.AlertGroup'), reporting: DS.hasMany('App.AlertReportDefinition'), parameters: DS.hasMany('App.AlertDefinitionParameter'), @@ -213,6 +214,12 @@ App.AlertDefinition = DS.Model.extend({ }.property('serviceName', 'service.displayName'), /** + * Determines if alert definition has help url + * @type {boolean} + */ + hasHelpUrl: Em.computed.bool('helpUrl'), + + /** * List of css-classes for alert types * @type {object} */ http://git-wip-us.apache.org/repos/asf/ambari/blob/a6d89bed/ambari-web/app/templates/main/alerts/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/configs.hbs b/ambari-web/app/templates/main/alerts/configs.hbs index cbac133..dff1b53 100644 --- a/ambari-web/app/templates/main/alerts/configs.hbs +++ b/ambari-web/app/templates/main/alerts/configs.hbs @@ -16,6 +16,12 @@ * limitations under the License. }} <form class="form-horizontal alert-configs"> + {{#if controller.content.hasHelpUrl}} + <div class="control-group"> + <label for="" class="control-label"><a {{bindAttr href="controller.content.helpUrl"}} target="_blank">{{t common.details}}</a></label> + <div class="controls"></div> + </div> + {{/if}} {{#each property in controller.configs}} <div {{bindAttr class=":control-group property.name property.isValid::error"}}> {{#if property.isPreLabeled}}
