github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-08 10:49:08 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 修改正则表达式

Browse Source
This commit is contained in:
ibuler
2019-09-24 15:00:32 +08:00
parent 471ed51360
commit 28afd1f6f9
5 changed files with 115 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/perms/api/asset_permission.py
View File

@@ -75,7 +75,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
return queryset
if not node:
return queryset.none()
nodes = node.get_ancestor(with_self=True)
nodes = node.get_ancestors(with_self=True)
queryset = queryset.filter(nodes__in=nodes)
return queryset
@@ -99,11 +99,11 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
for key in inherit_nodes_keys:
if key is None:
continue
ancestor_keys = Node.get_nodes_ancestor_keys_by_key(key, with_self=True)
ancestor_keys = Node.get_node_ancestor_keys(key, with_self=True)
inherit_all_nodes.update(ancestor_keys)
queryset = queryset.filter(
Q(assets__in=assets) | Q(nodes__key__in=inherit_all_nodes)
)
).distinct()
return queryset
def filter_user(self, queryset):