yvachot/FlaskALED
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update: users

Browse source
This commit is contained in:
Yûki VACHOT 2022-01-06 04:58:17 +01:00
parent 0865361aef
commit de3ddad057
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/application/api_functions.py
View file

@ -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(

2
backend/application/routes.py
View file

@ -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'])