Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
guo xiaoyong
Jumpserver
Commits
fef32112
Commit
fef32112
authored
3 years ago
by
halo
Committed by
Jiangjie.Bai
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix: 修复节点创建不能指定id问题,兼容api
parent
1627fae9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
apps/assets/serializers/node.py
+2
-3
apps/assets/serializers/node.py
with
2 additions
and
3 deletions
+2
-3
apps/assets/serializers/node.py
+
2
-
3
View file @
fef32112
...
...
@@ -5,7 +5,6 @@ from django.utils.translation import ugettext as _
from
orgs.mixins.serializers
import
BulkOrgResourceModelSerializer
from
..models
import
Asset
,
Node
__all__
=
[
'NodeSerializer'
,
"NodeAddChildrenSerializer"
,
"NodeAssetsSerializer"
,
"NodeTaskSerializer"
,
...
...
@@ -45,7 +44,6 @@ class NodeSerializer(BulkOrgResourceModelSerializer):
def
create
(
self
,
validated_data
):
full_value
=
validated_data
.
get
(
'full_value'
)
value
=
validated_data
.
get
(
'value'
)
# 直接多层级创建
if
full_value
:
...
...
@@ -53,7 +51,8 @@ class NodeSerializer(BulkOrgResourceModelSerializer):
# 根据 value 在 root 下创建
else
:
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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help