From 61b161727ee3bbe03c0a2dab80622bdd5a243021 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 16 Mar 2017 10:43:25 +0000 Subject: [PATCH] talk: Correctly show echo test Signed-off-by: Michael Tremer --- templates/talk/modules/contact.html | 6 +++--- webapp/backend/asterisk.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/talk/modules/contact.html b/templates/talk/modules/contact.html index a8bd7080..46d5e4d0 100644 --- a/templates/talk/modules/contact.html +++ b/templates/talk/modules/contact.html @@ -1,6 +1,9 @@ {% if application == "ConfBridge" %} {{ _("Conference Room %s") % number }} +{% elif application == "Echo" %} + {{ _("Echo Test") }} + {% elif application == "VoiceMail" %} {{ _("Voicemail") }}: @@ -23,9 +26,6 @@ {% elif number == "990" %} {{ _("Voicemail") }} -{% elif number == "991" %} - {{ _("Echo Test") }} - {% elif number == "992" %} {{ _("Music") }} diff --git a/webapp/backend/asterisk.py b/webapp/backend/asterisk.py index 430c7206..54a68112 100644 --- a/webapp/backend/asterisk.py +++ b/webapp/backend/asterisk.py @@ -239,6 +239,9 @@ class Channel(object): if self.application == "ConfBridge": return self.data # Will have the conference room number + elif self.application == "Echo": + return None + elif self.application == "VoiceMail": try: user, rest = self.data.split("@", 1) -- 2.47.3