github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of git.coding.net:jumpserver/Jumpserver into dev

pull/26/head
ibuler 2015-11-16 18:35:31 +08:00
parent f0d901e136 d3dd9d94d3
commit 71ef4b079a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
juser/views.py
View File

@ -315,9 +315,10 @@ def user_del(request):
for user_id in user_id_list: for user_id in user_id_list:
user = get_object(User, id=user_id) user = get_object(User, id=user_id)
if user: if user:
assets = user_permed(user) # TODO: annotation by liuzheng, because useless for me
result = _public_perm_api({'type': 'del_user', 'user': user, 'asset': assets}) # assets = user_permed(user)
print result # result = _public_perm_api({'type': 'del_user', 'user': user, 'asset': assets})
# print result
user.delete() user.delete()
return HttpResponse('删除成功') return HttpResponse('删除成功')