Skip to content

J
jumpserver
Commit cab34668 authored by liuzheng712's avatar liuzheng712
Browse files
Options

update

parent d369d4b5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
juser/views.py
View file @ cab34668
...@@ -141,7 +141,6 @@ def group_edit(request): ...@@ -141,7 +141,6 @@ def group_edit(request):
return my_render('juser/group_edit.html', locals(), request) return my_render('juser/group_edit.html', locals(), request)
<<<<<<< HEAD
# @require_role(role='admin') # @require_role(role='admin')
# def group_edit_adm(request): # def group_edit_adm(request):
# error = '' # error = ''
...@@ -426,11 +425,10 @@ def user_edit(request): ...@@ -426,11 +425,10 @@ def user_edit(request):
else: else:
return HttpResponseRedirect('/juser/user_list/') return HttpResponseRedirect('/juser/user_list/')
# if password != user.password: if password != '':
# password_decode = password password_decode = password
# password = CRYPTOR.md5_crypt(password) else:
# else: password_decode = None
# password_decode = None
db_update_user(user_id=user_id, db_update_user(user_id=user_id,
password=password, password=password,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment