From fe1845cd626791779027d2571f41aced9f652586 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 14 Jan 2020 14:14:15 +0100 Subject: [PATCH] Better fix. --- modoboa/core/models.py | 2 +- modoboa/limits/tests/test_user_limits.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 12ab6b3c9..89046f3c7 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -259,7 +259,7 @@ class User(AbstractUser): if role == "SuperAdmins": self.is_superuser = True else: - if self.is_superuser or self.has_perm("core.add_user"): + if self.is_superuser or role == "SimpleUsers": ObjectAccess.objects.filter(user=self).delete() self.is_superuser = False try: diff --git a/modoboa/limits/tests/test_user_limits.py b/modoboa/limits/tests/test_user_limits.py index 4e514ffc7..8151cae23 100644 --- a/modoboa/limits/tests/test_user_limits.py +++ b/modoboa/limits/tests/test_user_limits.py @@ -31,8 +31,8 @@ class PermissionsTestCase(lib_tests.ModoTestCase): } self.ajax_post(reverse("admin:account_add"), values) account = User.objects.get(username="reseller@test.com") - self.client.logout() - self.client.login(username="admin@test.com", password="toto") + admin = User.objects.get(username="admin@test.com") + self.client.force_login(admin) resp = self.ajax_post( reverse("admin:account_delete", args=[account.id]), {}, status=403