|
|
@ -679,10 +679,10 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, |
|
|
""" |
|
|
""" |
|
|
Return the mail address choosen by the user |
|
|
Return the mail address choosen by the user |
|
|
""" |
|
|
""" |
|
|
if not OptionalUser.get_cached_value('mail_accounts') or not self.internal_address: |
|
|
if not OptionalUser.get_cached_value('mail_accounts') or not self.internal_address or self.redirection: |
|
|
return self.external_mail |
|
|
return str(self.external_mail) |
|
|
else: |
|
|
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): |
|
|
def get_next_domain_name(self): |
|
|
"""Look for an available name for a new interface for |
|
|
"""Look for an available name for a new interface for |
|
|
|