Commit 71ef4b07 authored by ibuler's avatar ibuler

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

parents f0d901e1 d3dd9d94
...@@ -315,9 +315,10 @@ def user_del(request): ...@@ -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('删除成功')
......
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