diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index c71dc60a1..2d2e93108 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -663,7 +663,7 @@ class Domain(DatesAware): :param User account: the administrotor to remove """ from modoboa.lib.permissions import ungrant_access_to_object - ungrant_access_to_object(account, self) + ungrant_access_to_object(self, account) for mb in self.mailbox_set.all(): if mb.user.has_perm("admin.add_domain"): continue diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index cc3aca6b1..1225e6064 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -152,7 +152,7 @@ def editdomain(request, dom_id, tplname="admin/editdomainform.html"): form = DomainForm(request.user, request.POST, instances=instances) if form.is_valid(): try: - domain = form.save(request.user) + form.save(request.user) except AdminError, e: error = str(e) else: