You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/12/01 16:55:03 UTC
ambari git commit: AMBARI-8495. Alerts UI: Summary page should show
service display name NOT service name (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4f1039457 -> 1af3149e7
AMBARI-8495. Alerts UI: Summary page should show service display name NOT service name (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1af3149e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1af3149e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1af3149e
Branch: refs/heads/trunk
Commit: 1af3149e7308d2af20f54d2ff5cbd5b297337543
Parents: 4f10394
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Mon Dec 1 17:19:37 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Mon Dec 1 17:19:37 2014 +0200
----------------------------------------------------------------------
ambari-web/app/templates/main/alerts.hbs | 2 +-
ambari-web/app/templates/main/host/host_alerts.hbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1af3149e/ambari-web/app/templates/main/alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs
index 2ec37f8..b18eb54 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -54,7 +54,7 @@
<a href="#" {{action "gotoAlertDetails" alertDefinition}}>{{alertDefinition.label}}</a>
</td>
<td>{{{alertDefinition.status}}}</td>
- <td>{{alertDefinition.service.serviceName}}</td>
+ <td>{{alertDefinition.service.displayName}}</td>
<td><time class="timeago" {{bindAttr data-original-title="alertDefinition.lastTriggeredFormatted"}}>{{alertDefinition.lastTriggeredAgoFormatted}}</time></td>
<td class="last toggle-state-button">
{{#if alertDefinition.enabled}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1af3149e/ambari-web/app/templates/main/host/host_alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/host_alerts.hbs b/ambari-web/app/templates/main/host/host_alerts.hbs
index 5041e8e..8e0dd6e 100644
--- a/ambari-web/app/templates/main/host/host_alerts.hbs
+++ b/ambari-web/app/templates/main/host/host_alerts.hbs
@@ -46,7 +46,7 @@
<tr>
<td class="first">{{alertInstance.label}}</td>
<td>{{{alertInstance.status}}}</td>
- <td>{{alertInstance.service.serviceName}}</td>
+ <td>{{alertInstance.service.displayName}}</td>
<td><time class="timeago" {{bindAttr data-original-title="instance.lastTriggered"}}>{{instance.lastTriggeredAgoFormatted}}</time></td>
<td>{{alertInstance.formattedNotifications}}</td>
</tr>