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

[Bugfix] 修复资产授权列表 节点搜索报500错误

pull/3342/head
jym503558564 2019-10-17 11:03:06 +08:00
parent 01ead7c8e1
commit ee97144a10
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,15 +68,18 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
node_id = self.request.query_params.get('node_id') node_id = self.request.query_params.get('node_id')
node_name = self.request.query_params.get('node') node_name = self.request.query_params.get('node')
if node_id: if node_id:
node = get_object_or_none(Node, pk=node_id) nodes = Node.objects.filter(pk=node_id)
elif node_name: elif node_name:
node = get_object_or_none(Node, name=node_name) nodes = Node.objects.filter(value=node_name)
else: else:
return queryset return queryset
if not node: if not nodes:
return queryset.none() return queryset.none()
nodes = node.get_ancestors(with_self=True)
queryset = queryset.filter(nodes__in=nodes) related_nodes = []
for node in nodes:
[related_nodes.append(item) for item in node.get_ancestors(with_self=True)]
queryset = queryset.filter(nodes__in=related_nodes)
return queryset return queryset
def filter_asset(self, queryset): def filter_asset(self, queryset):