From fdde0a0f716e63c53723dcda55fc0decb25c1352 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 11 May 2016 16:15:42 +0200 Subject: [PATCH] Do not display internal aliases in mailbox form. fix #876 --- modoboa/admin/forms/account.py | 2 +- modoboa/admin/handlers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa/admin/forms/account.py b/modoboa/admin/forms/account.py index fb4551561..5cc8c4394 100644 --- a/modoboa/admin/forms/account.py +++ b/modoboa/admin/forms/account.py @@ -212,7 +212,7 @@ class AccountFormMail(forms.Form, DynamicForm): if self.mb is not None: self.fields["email"].required = True cpt = 1 - qset = self.mb.aliasrecipient_set.select_related("alias") + qset = self.mb.aliasrecipient_set.filter(alias__internal=False) for ralias in qset: name = "aliases_%d" % cpt self._create_field( diff --git a/modoboa/admin/handlers.py b/modoboa/admin/handlers.py index 04e3b2175..cc0f679b1 100644 --- a/modoboa/admin/handlers.py +++ b/modoboa/admin/handlers.py @@ -60,7 +60,7 @@ def manage_alias_for_mailbox(sender, instance, **kwargs): old_address = getattr(instance, "old_full_address", None) if old_address is None or old_address == instance.full_address: return - alr = models.AliasRecipient.objects.select_related("alias").get( + alr = models.AliasRecipient.objects.get( alias__address=old_address, address=old_address, r_mailbox=instance, alias__internal=True) alr.address = instance.full_address