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

fix: 修复 资产节点树 获取报错的问题（全局组织）

pull/9329/head
Bai 2023-01-17 13:40:51 +08:00 committed by Jiangjie.Bai
parent f647f88536
commit 6dc4519c78
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,8 @@ class NodeChildrenAsTreeApi(SerializeToTreeNodeMixin, NodeChildrenApi):
nodes = self.filter_queryset(self.get_queryset()).order_by('value') nodes = self.filter_queryset(self.get_queryset()).order_by('value')
nodes = self.serialize_nodes(nodes, with_asset_amount=True) nodes = self.serialize_nodes(nodes, with_asset_amount=True)
assets = self.filter_queryset_for_assets(self.get_queryset_for_assets()) assets = self.filter_queryset_for_assets(self.get_queryset_for_assets())
assets = self.serialize_assets(assets, self.instance.key) node_key = self.instance.key if self.instance else None
assets = self.serialize_assets(assets, node_key=node_key)
data = [*nodes, *assets] data = [*nodes, *assets]
return Response(data=data) return Response(data=data)