Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
6fae4d5d
Commit
6fae4d5d
authored
Mar 29, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] for some commit
parent
0c80e3e8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
base.py
apps/assets/serializers/base.py
+2
-4
No files found.
apps/assets/serializers/base.py
View file @
6fae4d5d
...
...
@@ -16,13 +16,11 @@ class AuthSerializer(serializers.ModelSerializer):
return
private_key
,
public_key
def
save
(
self
,
**
kwargs
):
password
=
self
.
validated_data
.
pop
(
'password'
)
or
None
private_key
=
self
.
validated_data
.
pop
(
'private_key'
)
or
None
password
=
self
.
validated_data
.
pop
(
'password'
,
None
)
or
None
private_key
=
self
.
validated_data
.
pop
(
'private_key'
,
None
)
or
None
self
.
instance
=
super
()
.
save
(
**
kwargs
)
if
password
or
private_key
:
private_key
,
public_key
=
self
.
gen_keys
(
private_key
,
password
)
self
.
instance
.
set_auth
(
password
=
password
,
private_key
=
private_key
,
public_key
=
public_key
)
return
self
.
instance
Write
Preview
Markdown
is supported
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