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

[Update] 修改节点生成规则

pull/1922/head
ibuler 2018-10-16 12:03:11 +08:00
parent 11aefa479b
commit 910dd4e593
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/assets/models/node.py
View File

@ -203,12 +203,14 @@ class Node(OrgModelMixin):
# 如果使用current_org 在set_current_org时会死循环 # 如果使用current_org 在set_current_org时会死循环
_current_org = get_current_org() _current_org = get_current_org()
with transaction.atomic(): with transaction.atomic():
if _current_org.is_default(): if _current_org.is_root():
key = '0' key = '0'
elif _current_org.is_default():
key = '1'
else: else:
set_current_org(Organization.root()) set_current_org(Organization.root())
org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$') org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$')
org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or [0] org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1']
key = str(max([int(k) for k in org_nodes_roots_keys]) + 1) key = str(max([int(k) for k in org_nodes_roots_keys]) + 1)
set_current_org(_current_org) set_current_org(_current_org)
root = cls.objects.create(key=key, value=_current_org.name) root = cls.objects.create(key=key, value=_current_org.name)
@ -225,7 +227,7 @@ class Node(OrgModelMixin):
@classmethod @classmethod
def default_node(cls): def default_node(cls):
defaults = {'value': 'Default'} defaults = {'value': 'Default'}
return cls.objects.get_or_create(defaults=defaults, key='0') return cls.objects.get_or_create(defaults=defaults, key='1')
@classmethod @classmethod
def get_tree_name_ref(cls): def get_tree_name_ref(cls):

3
apps/assets/views/asset.py
View File

@ -45,9 +45,6 @@ class AssetListView(AdminUserRequiredMixin, TemplateView):
template_name = 'assets/asset_list.html' template_name = 'assets/asset_list.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
if current_org.is_default():
Node.default_node()
else:
Node.root() Node.root()
context = { context = {
'app': _('Assets'), 'app': _('Assets'),