talk: Correctly show echo test

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/templates/talk/modules/contact.html b/templates/talk/modules/contact.html
index a8bd7080ddfa068bdfd2c766708f46b4bf0d09ff..46d5e4d0f92b51f1b63dc19ca41c89409762d7df 100644 (file)
--- 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 430c7206f3e75476e6da67d462ab760813203e63..54a6811243c8bd9d5d15e77a454f14282b445c1b 100644 (file)
--- 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)