talk: Show correct status when user is checking voicemail messages

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

diff --git a/templates/talk/modules/contact.html b/templates/talk/modules/contact.html
index 46d5e4d0f92b51f1b63dc19ca41c89409762d7df..6c12b4d1052cb31616cfbd609c78547b947b5578 100644 (file)
--- a/templates/talk/modules/contact.html
+++ b/templates/talk/modules/contact.html
@@ -4,7 +4,7 @@
 {% elif application == "Echo" %}
        {{ _("Echo Test") }}
 
-{% elif application == "VoiceMail" %}
+{% elif application in ("VoiceMail", "VoiceMailMain") %}
        {{ _("Voicemail") }}:
 
        {% if account %}
@@ -23,9 +23,6 @@
 {% elif number in ("980", "981", "982", "983", "984", "985", "986", "987", "988", "989") %}
        {{ _("Parked Calls Extension") }} <span class="text-muted">({{ number }})</span>
 
-{% elif number == "990" %}
-       {{ _("Voicemail") }}
-
 {% elif number == "992" %}
        {{ _("Music") }}
 

diff --git a/webapp/backend/asterisk.py b/webapp/backend/asterisk.py
index 54a6811243c8bd9d5d15e77a454f14282b445c1b..a45539fdbc7ff43f8108bfe9b199aaf5c3294d79 100644 (file)
--- a/webapp/backend/asterisk.py
+++ b/webapp/backend/asterisk.py
@@ -242,7 +242,7 @@ class Channel(object):
                 elif self.application == "Echo":
                         return None
 
-                elif self.application == "VoiceMail":
+                elif self.application in ("VoiceMail", "VoiceMailMain"):
                         try:
                             user, rest = self.data.split("@", 1)
                         except: