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
738c6353
Commit
738c6353
authored
Nov 17, 2015
by
liuzheng712
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user.update
parent
adf20f18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
user_api.py
juser/user_api.py
+1
-1
views.py
juser/views.py
+3
-3
No files found.
juser/user_api.py
View file @
738c6353
...
...
@@ -86,7 +86,7 @@ def db_update_user(**kwargs):
groups_post
=
kwargs
.
pop
(
'groups'
)
admin_groups_post
=
kwargs
.
pop
(
'admin_groups'
)
user_id
=
kwargs
.
pop
(
'user_id'
)
user
=
User
.
objects
.
get
(
id
=
user_id
)
user
=
User
.
objects
.
filter
(
id
=
user_id
)
if
user
:
pwd
=
kwargs
.
pop
(
'password'
)
user
.
update
(
**
kwargs
)
...
...
juser/views.py
View file @
738c6353
...
...
@@ -423,7 +423,7 @@ def profile(request):
def
change_info
(
request
):
header_title
,
path1
,
path2
=
'修改信息'
,
'用户管理'
,
'修改个人信息'
user_id
=
request
.
user
.
id
user
=
User
.
objects
.
get
(
id
=
user_id
)
user
=
User
.
objects
.
filter
(
id
=
user_id
)
error
=
''
if
not
user
:
return
HttpResponseRedirect
(
'/'
)
...
...
@@ -443,8 +443,8 @@ def change_info(request):
# if password != user.password:
# password = CRYPTOR.md5_crypt(password)
user
.
update
(
name
=
name
,
email
=
email
)
user
.
set_password
(
password
)
user
.
update
(
user
name
=
name
,
email
=
email
)
User
.
objects
.
get
(
id
=
user_id
)
.
set_password
(
password
)
msg
=
'修改成功'
return
render_to_response
(
'juser/change_info.html'
,
locals
(),
context_instance
=
RequestContext
(
request
))
...
...
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