From c404058ba8b2007aff13e8c2cda4190ce08d7cf3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 20 Sep 2013 22:26:49 +0200 Subject: [PATCH] Prevent a double delete order. see #482 --- modoboa/admin/models.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 2e2084857..a82275460 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -700,12 +700,6 @@ class Domain(DatesAware): Quota.objects.filter(username__contains='@%s' % self.name).delete() events.raiseEvent("DeleteMailbox", self.mailbox_set.all()) ungrant_access_to_objects(self.mailbox_set.all()) - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm == "yes" and not keepdir: - for mb in self.mailbox_set.all(): - MailboxOperation.objects.create( - type='delete', argument=mb.mail_home - ) if self.alias_set.count(): events.raiseEvent("MailboxAliasDelete", self.alias_set.all()) ungrant_access_to_objects(self.alias_set.all())