github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x'

Browse Source
This commit is contained in:
Antoine Nguyen
2016-03-09 10:57:56 +01:00
parent 1b16d4dd94 ce55746caa
commit 183b543a0d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/management/commands/subcommands/_export.py
+5 -7
View File
@@ -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')