Skip to content

Commit 3c69bb6

Browse files
committed
Do not throw error on invalid order param
1 parent 4bd3ddc commit 3c69bb6

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

server/mergin/tests/test_public_api_v2.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -651,11 +651,6 @@ def test_list_workspace_projects(client):
651651
resp_data = json.loads(response.data)
652652
assert resp_data["projects"][0]["name"] == project_name
653653

654-
# invalid order param
655-
response = client.get(url + f"?page=1&per_page=10&order_params=invalid DESC")
656-
assert response.status_code == 400
657-
assert response.json["detail"] == "Invalid order parameter"
658-
659654
# no permissions to workspace
660655
user2 = add_user("user", "password")
661656
login(client, user2.username, "password")

server/mergin/utils.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Copyright (C) Lutra Consulting Limited
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
4+
import logging
5+
46
import math
57
from collections import namedtuple
68
from datetime import datetime, timedelta, timezone
@@ -59,7 +61,8 @@ def get_order_param(
5961
attr = None
6062
order_attr = cls.__table__.c.get(col, None)
6163
if not isinstance(order_attr, Column):
62-
abort(400, "Invalid order parameter")
64+
logging.warning("Ignoring invalid order parameter.")
65+
return
6366
# sort by key in JSON field
6467
if attr:
6568
if not json_sort:

0 commit comments

Comments
 (0)