github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-08-01 06:45:55 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
liuzheng712 2015-11-07 10:27:55 +08:00
parent d369d4b50f
commit cab346686d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
juser/views.py
View File

@ -141,7 +141,6 @@ def group_edit(request):
return my_render('juser/group_edit.html', locals(), request)
<<<<<<< HEAD
# @require_role(role='admin')
# def group_edit_adm(request):
# error = ''
@ -426,11 +425,10 @@ def user_edit(request):
else:
return HttpResponseRedirect('/juser/user_list/')
# if password != user.password:
# password_decode = password
# password = CRYPTOR.md5_crypt(password)
# else:
# password_decode = None
if password != '':
password_decode = password
else:
password_decode = None
db_update_user(user_id=user_id,
password=password,