Skip to content
Snippets Groups Projects
Commit 351da5d4 authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Fix admin delete user in AdminUserList.js

parent 27fe4a95
No related branches found
No related tags found
No related merge requests found
......@@ -91,8 +91,7 @@ class AdminUserList extends ResourceList {
let listAction = listActionElement === null ? 'view' : listActionElement.dataset.listAction;
switch (listAction) {
case 'delete': {
console.log('delete', itemId);
Utils.deleteUserRequest(itemId);
Requests.users.entity.delete(itemId);
if (itemId === currentUserId) {window.location.href = '/';}
break;
}
......
......@@ -7,29 +7,29 @@ from app.models import Avatar, User
from . import bp
# @bp.route('/<hashid:user_id>', methods=['DELETE'])
# @content_negotiation(produces='application/json')
# def delete_user(user_id):
# def _delete_user(app, user_id):
# with app.app_context():
# user = User.query.get(user_id)
# user.delete()
# db.session.commit()
@bp.route('/<hashid:user_id>', methods=['DELETE'])
@content_negotiation(produces='application/json')
def delete_user(user_id):
def _delete_user(app, user_id):
with app.app_context():
user = User.query.get(user_id)
user.delete()
db.session.commit()
# user = User.query.get_or_404(user_id)
# if not (user == current_user or current_user.is_administrator()):
# abort(403)
# thread = Thread(
# target=_delete_user,
# args=(current_app._get_current_object(), user.id)
# )
# if user == current_user:
# logout_user()
# thread.start()
# response_data = {
# 'message': f'User "{user.username}" marked for deletion'
# }
# return response_data, 202
user = User.query.get_or_404(user_id)
if not (user == current_user or current_user.is_administrator()):
abort(403)
thread = Thread(
target=_delete_user,
args=(current_app._get_current_object(), user.id)
)
if user == current_user:
logout_user()
thread.start()
response_data = {
'message': f'User "{user.username}" marked for deletion'
}
return response_data, 202
# @bp.route('/<hashid:user_id>/avatar', methods=['DELETE'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment