From 3ae402426ba19f865b2b50c33d4f36ff542608bc Mon Sep 17 00:00:00 2001 From: djime Date: Thu, 4 Oct 2018 17:43:12 +0200 Subject: [PATCH] fixed unit tests --- modoboa/admin/forms/domain.py | 4 ++-- modoboa/admin/handlers.py | 4 ---- modoboa/admin/models/domain.py | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modoboa/admin/forms/domain.py b/modoboa/admin/forms/domain.py index d08d2563e..737e33b79 100644 --- a/modoboa/admin/forms/domain.py +++ b/modoboa/admin/forms/domain.py @@ -375,8 +375,8 @@ class DomainForm(TabForms): """ if "general" in self.instances: - self.instances["general"].oldname = self.instances["general"].name - self.instances["general"].old_dkim_key_length = self.instances["general"].dkim_key_length + instance = self.instances["general"] + instance.oldname = instance.name return super(DomainForm, self).is_valid() def save(self): diff --git a/modoboa/admin/handlers.py b/modoboa/admin/handlers.py index 3dfbd609a..2159f5dd8 100644 --- a/modoboa/admin/handlers.py +++ b/modoboa/admin/handlers.py @@ -25,10 +25,6 @@ def update_domain_mxs_and_mailboxes(sender, instance, **kwargs): return instance.mailbox_set.filter(use_domain_quota=True).update( quota=instance.default_mailbox_quota) - if instance.old_dkim_key_length != instance.dkim_key_length: - instance.dkim_public_key = "" - instance.dkim_private_key_path = "" - instance.save() if instance.old_mail_homes is None: return qset = ( diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py index 1d9534423..6fc9be1ca 100644 --- a/modoboa/admin/models/domain.py +++ b/modoboa/admin/models/domain.py @@ -263,6 +263,9 @@ class Domain(AdminObject): self.old_mail_homes = { mb.id: mb.mail_home for mb in self.mailbox_set.all() } + if self.old_dkim_key_length != self.dkim_key_length: + self.dkim_public_key = "" + self.dkim_private_key_path = "" super(Domain, self).save(*args, **kwargs) def delete(self, fromuser, keepdir=False):