From 0e0306e77c0141e4f1b6ca4665f4bcef989c42ed Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 8 Mar 2016 19:07:08 +0100 Subject: [PATCH] Fix #841 --- .../admin/management/commands/subcommands/_export.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modoboa/admin/management/commands/subcommands/_export.py b/modoboa/admin/management/commands/subcommands/_export.py index 6cf4c6e91..4786e3462 100644 --- a/modoboa/admin/management/commands/subcommands/_export.py +++ b/modoboa/admin/management/commands/subcommands/_export.py @@ -36,14 +36,12 @@ class ExportCommand(BaseCommand): u.to_csv(self.csvwriter) dumped_aliases = [] qset = ( - models.AliasRecipient.objects.filter(r_alias__isnull=False) - .distinct("r_alias") - .select_related("r_alias") - .prefetch_related("r_alias__aliasrecipient_set") + models.Alias.objects.exclude(alias_recipient_aliases=None) + .distinct().prefetch_related("aliasrecipient_set") ) - for alr in qset: - alr.r_alias.to_csv(self.csvwriter) - dumped_aliases += [alr.r_alias.pk] + for alias in qset: + alias.to_csv(self.csvwriter) + dumped_aliases += [alias.pk] qset = ( models.Alias.objects.exclude(pk__in=dumped_aliases) .prefetch_related('aliasrecipient_set')