From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 16 Mar 2017 10:46:53 +0000 (+0000)
Subject: talk: Show correct status when user is checking voicemail messages
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=991a0808b9da58d2831e6de991be954713b41dd1;p=ipfire.org.git

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 46d5e4d0..6c12b4d1 100644
--- 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 54a68112..a45539fd 100644
--- 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: