github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改asset 过滤资产api

pull/3217/head^2
ibuler 2019-09-11 21:22:56 +08:00
parent dbb441dfb6
commit 80415afa9f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,11 +93,15 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
return queryset return queryset
if not assets: if not assets:
return queryset.none() return queryset.none()
inherit_nodes = set() inherit_all_nodes = set()
for asset in assets: inherit_nodes_keys = assets.all().values_list('nodes__key', flat=True)
for node in asset.nodes.all():
inherit_nodes.update(set(node.get_ancestor(with_self=True))) for key in inherit_nodes_keys:
queryset = queryset.filter(Q(assets__in=assets) | Q(nodes__in=inherit_nodes)) ancestor_keys = Node.get_nodes_ancestor_keys_by_key(key, with_self=True)
inherit_all_nodes.update(ancestor_keys)
queryset = queryset.filter(
Q(assets__in=assets) | Q(nodes__key__in=inherit_all_nodes)
)
return queryset return queryset
def filter_user(self, queryset): def filter_user(self, queryset):