informatic
/
kasownik
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web: fix member email handling to always return *something* ~enleth

master
Kasownik 2017-05-12 18:42:52 +02:00
parent b004435c13
commit 2ef84a4f20
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/webapp/models.py
View File

@ -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."""