From 42ebb1f82f9ef19a7c95971908021918bc8a7d1f Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 8 Mar 2022 20:00:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=97=B6=20=E5=88=A4=E6=96=AD=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=20(#7774)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng626 <1304903146@qq.com> --- apps/rbac/api/role.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/rbac/api/role.py b/apps/rbac/api/role.py index e679edf67..a11edc409 100644 --- a/apps/rbac/api/role.py +++ b/apps/rbac/api/role.py @@ -27,12 +27,14 @@ class RoleViewSet(JMSModelViewSet): } def perform_destroy(self, instance): + from orgs.utils import tmp_to_root_org if instance.builtin: error = _("Internal role, can't be destroy") raise PermissionDenied(error) - if instance.users.count() >= 1: - error = _("The role has been bound to users, can't be destroy") - raise PermissionDenied(error) + with tmp_to_root_org(): + if instance.users.count() >= 1: + error = _("The role has been bound to users, can't be destroy") + raise PermissionDenied(error) return super().perform_destroy(instance) def perform_update(self, serializer):