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

Merge pull request #2402 from jumpserver/dev 

[Update] 创建子节点支持id
pull/2486/head
老广 2019-02-18 13:02:15 +08:00 committed by GitHub
parent 19be7ac580 c4af6fa72d
commit 7591f40b2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/assets/api/node.py
View File

@ -163,12 +163,13 @@ class NodeChildrenApi(mixins.ListModelMixin, generics.CreateAPIView):
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):
instance = self.get_object() instance = self.get_object()
value = request.data.get("value") value = request.data.get("value")
_id = request.data.get('id') or None
values = [child.value for child in instance.get_children()] values = [child.value for child in instance.get_children()]
if value in values: if value in values:
raise ValidationError( raise ValidationError(
'The same level node name cannot be the same' 'The same level node name cannot be the same'
) )
node = instance.create_child(value=value) node = instance.create_child(value=value, _id=_id)
return Response(self.serializer_class(instance=node).data, status=201) return Response(self.serializer_class(instance=node).data, status=201)
def get_object(self): def get_object(self):

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

@ -134,10 +134,10 @@ class Node(OrgModelMixin):
count = max(values) + 1 if values else 1 count = max(values) + 1 if values else 1
return '{} {}'.format(name, count) return '{} {}'.format(name, count)
def create_child(self, value): def create_child(self, value, _id=None):
with transaction.atomic(): with transaction.atomic():
child_key = self.get_next_child_key() child_key = self.get_next_child_key()
child = self.__class__.objects.create(key=child_key, value=value) child = self.__class__.objects.create(id=_id, key=child_key, value=value)
return child return child
def get_children(self, with_self=False): def get_children(self, with_self=False):