diff --git a/backend/application/api_functions.py b/backend/application/api_functions.py index bb67cbd..268d41a 100644 --- a/backend/application/api_functions.py +++ b/backend/application/api_functions.py @@ -329,25 +329,27 @@ def db_users(ip, user_id, query, by='email,nickname', id=None, is_admin=None, or if is_admin is not None: users = users.filter(Users.is_admin == is_admin) - order_by = order_by.split(',') - if order_by[0] == 'nickname': - order = Users.nickname - elif order_by[0] == 'id': - order = Users.id - elif order_by[0] == 'is_admin': - order = Users.is_admin - else: - order = Users.email - - if len(order_by) > 1: - if order_by[1] == 'asc': - users = users.order_by(asc(order)) - elif order_by[1] == 'desc': - users = users.order_by(desc(order)) + if order_by is not None: + order_by = order_by.split(',') + if order_by[0] == 'nickname': + order = Users.nickname + elif order_by[0] == 'id': + order = Users.id + elif order_by[0] == 'is_admin': + order = Users.is_admin + else: + order = Users.email + if len(order_by) > 1: + if order_by[1] == 'asc': + users = users.order_by(asc(order)) + elif order_by[1] == 'desc': + users = users.order_by(desc(order)) + else: + users = users.order_by(asc(order)) else: users = users.order_by(asc(order)) else: - users = users.order_by(asc(order)) + users = users.order_by(asc(Users.email)) users = users.all() diff --git a/backend/application/routes.py b/backend/application/routes.py index d08909a..46f5649 100644 --- a/backend/application/routes.py +++ b/backend/application/routes.py @@ -324,6 +324,11 @@ def users(): get_id = request.args.get('id') get_is_admin = request.args.get('is_admin') 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) if res['status'] == 1: return send_error(500, res['message'])