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
3a812c22
Unverified
Commit
3a812c22
authored
Nov 22, 2019
by
BaiJiangJie
Committed by
GitHub
Nov 22, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3456 from jumpserver/dev_bai
[Update] 发送重置密钥邮件时,清除用户公钥
parents
72ea036a
f47781a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
user.py
apps/users/api/user.py
+1
-1
login.py
apps/users/views/login.py
+0
-1
No files found.
apps/users/api/user.py
View file @
3a812c22
...
...
@@ -119,7 +119,7 @@ class UserResetPKApi(UserQuerysetMixin, generics.UpdateAPIView):
def
perform_update
(
self
,
serializer
):
from
..utils
import
send_reset_ssh_key_mail
user
=
self
.
get_object
()
user
.
is_public_key_valid
=
Fals
e
user
.
public_key
=
Non
e
user
.
save
()
send_reset_ssh_key_mail
(
user
)
...
...
apps/users/views/login.py
View file @
3a812c22
...
...
@@ -142,7 +142,6 @@ class UserFirstLoginView(PermissionsMixin, SessionWizardView):
if
field
.
value
():
setattr
(
user
,
field
.
name
,
field
.
value
())
user
.
is_first_login
=
False
user
.
is_public_key_valid
=
True
user
.
save
()
context
=
{
'user_guide_url'
:
settings
.
USER_GUIDE_URL
...
...
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