mirror of https://github.com/jumpserver/jumpserver
[Update] 修改节点创建规则
parent
910dd4e593
commit
2c18a27e3a
|
@ -34,7 +34,8 @@ def default_cluster():
|
|||
def default_node():
|
||||
try:
|
||||
from .node import Node
|
||||
return Node.root()
|
||||
root = Node.root()
|
||||
return root
|
||||
except:
|
||||
return None
|
||||
|
||||
|
|
|
@ -211,7 +211,8 @@ class Node(OrgModelMixin):
|
|||
set_current_org(Organization.root())
|
||||
org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$')
|
||||
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 = max([int(k) for k in org_nodes_roots_keys])
|
||||
key = str(key + 1) if key != 0 else '2'
|
||||
set_current_org(_current_org)
|
||||
root = cls.objects.create(key=key, value=_current_org.name)
|
||||
return root
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
from werkzeug.local import Local
|
||||
from django.db import models
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.db.models import Q
|
||||
from django.shortcuts import redirect
|
||||
from django.forms import ModelForm
|
||||
from django.http.response import HttpResponseForbidden
|
||||
|
|
Loading…
Reference in New Issue