From 6ff614346b11a783b8b1c6e3bf13245fa541dcd2 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 15 Sep 2015 00:26:15 +0200 Subject: [PATCH] talk: Show different types of phone numbers Signed-off-by: Michael Tremer --- templates/talk/phonebook-contact.html | 8 ++++++++ webapp/backend/accounts.py | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/templates/talk/phonebook-contact.html b/templates/talk/phonebook-contact.html index 5926447..6d203f0 100644 --- a/templates/talk/phonebook-contact.html +++ b/templates/talk/phonebook-contact.html @@ -22,6 +22,7 @@

{% if account.uses_sip_forwarding() %} + {{ account.sip_id }} {% elif account.sip_is_online() %} {{ account.sip_id }} @@ -82,6 +83,13 @@
    {% for number in account.telephone_numbers %}
  • + {% if number in account.mobile_telephone_numbers %} + + {% elif number in account.home_telephone_numbers %} + + {% else %} + + {% end %} {{ number }}
  • {% end %} diff --git a/webapp/backend/accounts.py b/webapp/backend/accounts.py index a359a71..242cbf3 100644 --- a/webapp/backend/accounts.py +++ b/webapp/backend/accounts.py @@ -279,7 +279,20 @@ class Account(Object): @property def telephone_numbers(self): - return self.attributes.get("telephoneNumber") + return self._telephone_numbers + self.mobile_telephone_numbers \ + + self.home_telephone_numbers + + @property + def _telephone_numbers(self): + return self.attributes.get("telephoneNumber") or [] + + @property + def home_telephone_numbers(self): + return self.attributes.get("homePhone") or [] + + @property + def mobile_telephone_numbers(self): + return self.attributes.get("mobile") or [] def avatar_url(self, size=None): if self.backend.debug: -- 2.39.2