From de3ddad0573b15701e4f276edccdeea6270bae02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BBki=20Vachot?= Date: Thu, 6 Jan 2022 04:58:17 +0100 Subject: [PATCH] Update: users --- backend/application/api_functions.py | 4 ++-- backend/application/routes.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/application/api_functions.py b/backend/application/api_functions.py index d89da32..124b509 100644 --- a/backend/application/api_functions.py +++ b/backend/application/api_functions.py @@ -375,7 +375,7 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or table='users', id_user=user_id ) - return {'status': 0, 'message': message, 'data': users.json()} + return {'status': 0, 'message': message, 'data': [user.json() for user in users]} elif id: if is_admin: if order_by == 'nickname': @@ -413,7 +413,7 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or table='users', id_user=user_id ) - return {'status': 0, 'message': message, 'data': users.json()} + return {'status': 0, 'message': message, 'data': [user.json() for user in users]} else: message = 'Need q and by field if using query and not id' db_create_log( diff --git a/backend/application/routes.py b/backend/application/routes.py index 19464d1..12d144e 100644 --- a/backend/application/routes.py +++ b/backend/application/routes.py @@ -335,6 +335,6 @@ def users(): if res['status'] == 1: return send_error(500, res['message']) else: - return send_message(res['message'], None) + return send_message(res['message'], res['data']) else: return send_error(500, token['message'])