From 2ef84a4f209b895067ce7c0714e4d8cfe38d4156 Mon Sep 17 00:00:00 2001 From: Kasownik Date: Fri, 12 May 2017 18:42:52 +0200 Subject: [PATCH] web: fix member email handling to always return *something* ~enleth --- web/webapp/models.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/webapp/models.py b/web/webapp/models.py index 1e8c7b1..6458576 100644 --- a/web/webapp/models.py +++ b/web/webapp/models.py @@ -266,15 +266,18 @@ class Member(db.Model): return self.get_custom_email() is not None def get_contact_email(self, adrtype = None): - + email = None if (self.uses_ldap_email() and adrtype is None) or adrtype == 'ldap': - return self.get_ldap_email() + email = self.get_ldap_email() elif (self.uses_local_email() and adrtype is None) or adrtype == 'local': - return self.get_local_email() + email = self.get_local_email() elif (self.uses_custom_email() and adrtype is None) or adrtype == 'custom': - return self.preferred_email - else: # fallback - return self.get_local_email() + email = self.preferred_email + + if email is None: + email = self.get_local_email() + + return email def get_status(self, force_refresh = False): """It's better to call this after doing a full select of data."""