From 33860bb955e2b9559c5bcf302ceb57b6db96c303 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:51:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=9F=A5=E7=9C=8B=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=94=A8=E6=88=B7500=E9=97=AE=E9=A2=98=20(#8963)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 小冯 --- apps/assets/models/asset.py | 2 +- apps/rbac/permissions.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 95ba28d21..b02e6a8d6 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -118,7 +118,7 @@ class NodesRelationMixin: _nodes = node.get_ancestors(with_self=True) nodes.extend(list(_nodes)) if flat: - nodes = list(reduce(lambda x, y: set(x) | set(y), nodes)) + nodes = list(set([node.id for node in nodes])) return nodes diff --git a/apps/rbac/permissions.py b/apps/rbac/permissions.py index 3538246b7..1992db90d 100644 --- a/apps/rbac/permissions.py +++ b/apps/rbac/permissions.py @@ -121,8 +121,8 @@ class RBACPermission(permissions.DjangoModelPermissions): if request.user.is_anonymous and self.authenticated_users_only: return False - raw_action = getattr(view, 'raw_action', None) - if raw_action == 'metadata': + raw_action = getattr(view, 'raw_action', request.method) + if raw_action in ['metadata', 'OPTIONS']: return True perms = self.get_require_perms(request, view)