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

Update: Bug resolved

Browse source
This commit is contained in:
Yûki VACHOT 2022-01-31 15:58:32 +01:00
parent bb343d3a29
commit 08a0511647
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/application/api_functions.py
View file

@ -329,6 +329,7 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
if is_admin is not None: if is_admin is not None:
users = users.filter(Users.is_admin == is_admin) users = users.filter(Users.is_admin == is_admin)
if order_by is not None:
order_by = order_by.split(',') order_by = order_by.split(',')
if order_by[0] == 'nickname': if order_by[0] == 'nickname':
order = Users.nickname order = Users.nickname
@ -338,7 +339,6 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
order = Users.is_admin order = Users.is_admin
else: else:
order = Users.email order = Users.email
if len(order_by) > 1: if len(order_by) > 1:
if order_by[1] == 'asc': if order_by[1] == 'asc':
users = users.order_by(asc(order)) users = users.order_by(asc(order))
@ -348,6 +348,8 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or
users = users.order_by(asc(order)) users = users.order_by(asc(order))
else: else:
users = users.order_by(asc(order)) users = users.order_by(asc(order))
else:
users = users.order_by(asc(Users.email))
users = users.all() users = users.all()

5
backend/application/routes.py
View file

@ -324,6 +324,11 @@ def users():
get_id = request.args.get('id') get_id = request.args.get('id')
get_is_admin = request.args.get('is_admin') get_is_admin = request.args.get('is_admin')
get_order_by = request.args.get('order_by') get_order_by = request.args.get('order_by')
if get_ip is None:
get_ip = request.remote_addr
if get_user_id is None:
get_user_id = 0
res = db_users(get_ip, get_user_id, get_query, get_by, get_id, get_is_admin, get_order_by) res = db_users(get_ip, get_user_id, get_query, get_by, get_id, get_is_admin, get_order_by)
if res['status'] == 1: if res['status'] == 1:
return send_error(500, res['message']) return send_error(500, res['message'])