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

fix: 修复 luna 类型树数量计算不准确bug (#10492) 

Co-authored-by: feng <1304903146@qq.com>
pull/10494/head
fit2bot 2023-05-18 15:42:30 +08:00 committed by GitHub
parent b0b14fe2e1
commit 6c19fd4192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/perms/api/user_permission/tree/node_with_asset.py
View File

@ -177,8 +177,7 @@ class UserPermedNodeChildrenWithAssetsAsCategoryTreeApi(
return [] return []
pid = f'ROOT_{str(assets[0].category).upper()}_{tp}' pid = f'ROOT_{str(assets[0].category).upper()}_{tp}'
return self.serialize_assets(assets, pid=pid) return self.serialize_assets(assets, pid=pid)
resource_platforms = assets.order_by('id').values_list('platform_id', flat=True)
resource_platforms = assets.values_list('platform_id', flat=True)
node_all = AllTypes.get_tree_nodes(resource_platforms) node_all = AllTypes.get_tree_nodes(resource_platforms)
pattern = re.compile(r'\(0\)?') pattern = re.compile(r'\(0\)?')
nodes = [] nodes = []