rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-09 03:16:25 +00:00
Code Issues Releases Wiki Activity

Fix compte mail , get_mail si redirection

Browse source
This commit is contained in:
chirac 2018-06-29 18:53:39 +02:00 committed by Maël Kervella
parent bf189f4c4f
commit 7bb62daf42
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
users/models.py
View file

@ -679,10 +679,10 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
"""
Return the mail address choosen by the user
"""
if not OptionalUser.get_cached_value('mail_accounts') or not self.internal_address:
return self.external_mail
if not OptionalUser.get_cached_value('mail_accounts') or not self.internal_address or self.redirection:
return str(self.external_mail)
else:
return self.mail.mailalias_set.get(valeur=self.pseudo)
return str(self.mailalias_set.get(valeur=self.pseudo))
def get_next_domain_name(self):
"""Look for an available name for a new interface for