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

fix: 修复获取整个授权树缺少节点 bug

pull/5739/head
xinwen 2021-03-12 18:40:24 +08:00 committed by 老广
parent 296bb88834
commit 3080bf3647
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/utils/asset/user_permission.py
View File

@ -611,12 +611,12 @@ class UserGrantedNodesQueryUtils(UserGrantedUtilsBase):
for node in nodes: for node in nodes:
node.use_granted_assets_amount() node.use_granted_assets_amount()
key_to_node_mapper[node.key] = node
if node.node_from == NodeFrom.granted: if node.node_from == NodeFrom.granted:
# 直接授权的节点 # 直接授权的节点
# 增加查询后代节点的过滤条件 # 增加查询后代节点的过滤条件
nodes_descendant_q |= Q(key__startswith=f'{node.key}:') nodes_descendant_q |= Q(key__startswith=f'{node.key}:')
key_to_node_mapper[node.key] = node
if nodes_descendant_q: if nodes_descendant_q:
descendant_nodes = PermNode.objects.filter( descendant_nodes = PermNode.objects.filter(