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

[Update] 修改可能导致的树创建问题 (#3280)

pull/3283/head
老广 2019-09-25 16:31:18 +08:00 committed by GitHub
parent a8c2a348aa
commit 9f56ac8a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/assets/utils.py
View File

@ -26,10 +26,6 @@ def get_system_user_by_id(id):
class TreeService(Tree): class TreeService(Tree):
tag_sep = ' / ' tag_sep = ' / '
cache_key = '_NODE_FULL_TREE'
cache_time = 3600
has_empty_node = False
has_ungrouped_node = False
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -43,13 +39,17 @@ class TreeService(Tree):
from orgs.utils import tmp_to_root_org from orgs.utils import tmp_to_root_org
with tmp_to_root_org(): with tmp_to_root_org():
all_nodes = Node.objects.all() all_nodes = list(Node.objects.all().values("key", "value"))
all_nodes.sort(key=lambda x: len(x["key"].split(":")))
tree = cls() tree = cls()
tree.create_node(tag='', identifier='') tree.create_node(tag='', identifier='')
for node in all_nodes: for node in all_nodes:
key = node["key"]
value = node["value"]
parent_key = ":".join(key.split(":")[:-1])
tree.create_node( tree.create_node(
tag=node.value, identifier=node.key, tag=value, identifier=key,
parent=node.parent_key, parent=parent_key,
) )
tree.init_assets() tree.init_assets()
return tree return tree