github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-21 15:58:52 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 修复显示未授权资产的bug

Browse Source
This commit is contained in:
ibuler
2020-04-16 12:08:52 +08:00
parent 3648a1458b
commit 864a4c0485
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/perms/utils/asset_permission.py
View File

@@ -290,7 +290,7 @@ class AssetPermissionUtil(AssetPermissionUtilCacheMixin):
def parse_user_tree_to_full_tree(self, user_tree):
"""
经过前面两个动作，用户授权的节点已放到树上，但是树不是完整的，
这里要讲树构造成一个完整的书
这里要讲树构造成一个完整的树
"""
# 开始修正user_tree，保证父节点都在树上
root_children = user_tree.children('')
@@ -300,7 +300,8 @@ class AssetPermissionUtil(AssetPermissionUtilCacheMixin):
if child.identifier.startswith('-'):
continue
ancestors = self.full_tree.ancestors(
child.identifier, with_self=False, deep=True
child.identifier, with_self=False, deep=True,
with_assets=False,
)
if not ancestors:
continue
@@ -346,6 +347,7 @@ class AssetPermissionUtil(AssetPermissionUtilCacheMixin):
self.add_direct_nodes_to_user_tree(user_tree)
self.add_single_assets_node_to_user_tree(user_tree)
self.parse_user_tree_to_full_tree(user_tree)
print(user_tree.all_assets('2'))
self.add_favorite_node_if_need(user_tree)
self.set_user_tree_to_cache_if_need(user_tree)
self.set_user_tree_to_local(user_tree)