diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-18 18:14:38 +0100 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-06-18 18:14:38 +0100 |
| commit | de83746b5a33f1d2ac573f67c94760cb0a67b57e (patch) | |
| tree | 15bba173841054b11fd3ab0515f9ea60c0850b0f /views | |
| parent | 9e3d08a472053ddcd16ab69ad057b9e59194f9af (diff) | |
* Don't send acknowledged notifications unless the alert is raised
* Unacknowledge a cleared alert or a newly raised one
* Fixed interface unexpected nil errors.
Diffstat (limited to 'views')
| -rw-r--r-- | views/_alerts_table_alert_detail.haml | 2 | ||||
| -rw-r--r-- | views/_alerts_table_alert_summary.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/views/_alerts_table_alert_detail.haml b/views/_alerts_table_alert_detail.haml index b5ada45..3bb25c3 100644 --- a/views/_alerts_table_alert_detail.haml +++ b/views/_alerts_table_alert_detail.haml @@ -6,7 +6,7 @@ #{alert.detail} %address - if alert.raised? or alert.acknowledged? - Raised at #{alert.raised_at.to_s_human} • + Raised at #{(alert.raised_at || Time.now).to_s_human} • - if alert.acknowledged? Ack'd at #{alert.acknowledged_at.to_s_human} by #{alert.acknowledged_by} • Source: #{alert.source} • diff --git a/views/_alerts_table_alert_summary.haml b/views/_alerts_table_alert_summary.haml index 24162c6..f27ceeb 100644 --- a/views/_alerts_table_alert_summary.haml +++ b/views/_alerts_table_alert_summary.haml @@ -11,4 +11,4 @@ :href => "/alert/#{alert.id}", | :onclick => "fetchDetail('#{alert.id}'); return false;"} Details ↓ - %td= alert.raised_at.to_s_relative + %td= (alert.raised_at || alert.cleared_at || Time.now).to_s_relative |