github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-08-11 02:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10416 from jumpserver/pr@dev@fix_categorytree1

Browse Source 
fix: 修复资产类型树循环显示的问题
This commit is contained in:
老广 2023-05-10 11:07:39 +08:00 committed by GitHub
commit 926550bf26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/assets/api/tree.py
View File

@ -163,8 +163,10 @@ class CategoryTreeApi(SerializeToTreeNodeMixin, generics.ListAPIView):
# 资源数量统计可选项 (asset, account) # 资源数量统计可选项 (asset, account)
count_resource = self.request.query_params.get('count_resource', 'asset') count_resource = self.request.query_params.get('count_resource', 'asset')
if include_asset and self.request.query_params.get('key'): if not self.request.query_params.get('key'):
nodes = AllTypes.to_tree_nodes(include_asset, count_resource=count_resource)
elif include_asset:
nodes = self.get_assets() nodes = self.get_assets()
else: else:
nodes = AllTypes.to_tree_nodes(include_asset, count_resource=count_resource) nodes = []
return Response(data=nodes) return Response(data=nodes)