github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-31 06:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8964 from jumpserver/dev

Browse Source 
v2.27.0-rc3
This commit is contained in:
Jiangjie.Bai 2022-10-18 11:19:59 +08:00 committed by GitHub
commit 384873b4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/asset.py
View File

@ -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

4
apps/rbac/permissions.py
View File

@ -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)