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

fix: 修复节点创建不能指定id问题，兼容api

pull/7729/head
halo 2022-03-02 15:18:43 +08:00 committed by Jiangjie.Bai
parent ab1024fbf4
commit 04e46e4b1c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/assets/serializers/node.py
View File

@ -5,7 +5,6 @@ from django.utils.translation import ugettext as _
from orgs.mixins.serializers import BulkOrgResourceModelSerializer from orgs.mixins.serializers import BulkOrgResourceModelSerializer
from ..models import Asset, Node from ..models import Asset, Node
__all__ = [ __all__ = [
'NodeSerializer', "NodeAddChildrenSerializer", 'NodeSerializer', "NodeAddChildrenSerializer",
"NodeAssetsSerializer", "NodeTaskSerializer", "NodeAssetsSerializer", "NodeTaskSerializer",
@ -45,7 +44,6 @@ class NodeSerializer(BulkOrgResourceModelSerializer):
def create(self, validated_data): def create(self, validated_data):
full_value = validated_data.get('full_value') full_value = validated_data.get('full_value')
value = validated_data.get('value')
# 直接多层级创建 # 直接多层级创建
if full_value: if full_value:
@ -53,7 +51,8 @@ class NodeSerializer(BulkOrgResourceModelSerializer):
# 根据 value 在 root 下创建 # 根据 value 在 root 下创建
else: else:
key = Node.org_root().get_next_child_key() key = Node.org_root().get_next_child_key()
node = Node.objects.create(key=key, value=value) validated_data['key'] = key
node = Node.objects.create(**validated_data)
return node return node