mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-10-31 02:32:45 +00:00 
			
		
		
		
	Fix admin delete user in AdminUserList.js
This commit is contained in:
		| @@ -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']) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user