From e4646205cbd13c714b8b10ff23a12abcff707ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Wed, 20 Nov 2019 17:31:36 +0200 Subject: [PATCH] Use channel.get_kind_display() in more places. --- templates/front/channels.html | 22 ---------------------- templates/front/event_summary.html | 18 +++++++----------- 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/templates/front/channels.html b/templates/front/channels.html index 36406da5..7a570a12 100644 --- a/templates/front/channels.html +++ b/templates/front/channels.html @@ -51,14 +51,6 @@ {% endif %} {% elif ch.kind == "pd" %} PagerDuty account {{ ch.pd_account }} - {% elif ch.kind == "pagertree" %} - PagerTree - {% elif ch.kind == "pagerteam" %} - Pager Team - {% elif ch.kind == "opsgenie" %} - OpsGenie - {% elif ch.kind == "victorops" %} - VictorOps {% elif ch.kind == "po" %} Pushover ({{ ch.po_priority }} priority) {% elif ch.kind == "slack" %} @@ -67,14 +59,6 @@ team {{ ch.slack_team }}, channel {{ ch.slack_channel }} {% endif %} - {% elif ch.kind == "webhook" %} - Webhook - {% elif ch.kind == "apprise" %} - Apprise - {% elif ch.kind == "pushbullet" %} - Pushbullet - {% elif ch.kind == "discord" %} - Discord {% elif ch.kind == "telegram" %} Telegram {% if ch.telegram_type == "group" %} @@ -82,8 +66,6 @@ {% elif ch.telegram_type == "private" %} user {{ ch.telegram_name }} {% endif %} - {% elif ch.kind == "hipchat" %} - HipChat {% elif ch.kind == "sms" %} SMS to {{ ch.sms_number }} {% elif ch.kind == "trello" %} @@ -100,10 +82,6 @@ {% if ch.whatsapp_notify_up and not ch.whatsapp_notify_down %} (up only) {% endif %} - {% elif ch.kind == "mattermost" %} - Mattermost - {% elif ch.kind == "msteams" %} - Microsoft Teams {% else %} {{ ch.get_kind_display }} {% endif %} diff --git a/templates/front/event_summary.html b/templates/front/event_summary.html index cd78fd6b..f913c32d 100644 --- a/templates/front/event_summary.html +++ b/templates/front/event_summary.html @@ -5,18 +5,11 @@ {% if event.channel.slack_channel %} to {{ event.channel.slack_channel }} {% endif %} -{% elif event.channel.kind == "pd" %} - Sent alert to PagerDuty -{% elif event.channel.kind == "pagertree" %} - Sent alert to PagerTree -{% elif event.channel.kind == "pagerteam" %} - Sent alert to Pager Team -{% elif event.channel.kind == "opsgenie" %} - Sent alert to OpsGenie -{% elif event.channel.kind == "hipchat" %} - Sent alert to HipChat {% elif event.channel.kind == "po" %} Sent a Pushover notification + {% if event.channel.name %} + ({{ event.channel.name }}) + {% endif %} {% elif event.channel.kind == "webhook" %} Called webhook {{ event.channel.url_down }} {% elif event.channel.kind == "msteams" %} @@ -43,7 +36,10 @@ ({{ event.channel.name }}) {% endif %} {% else %} - Sent alert to {{ event.channel.kind|capfirst }} + Sent alert to {{ event.channel.get_kind_display }} + {% if event.channel.name %} + ({{ event.channel.name }}) + {% endif %} {% endif %} {% if event.error %}