Skip to content

Commit aae5d97

Browse files
committed
Review II - kwargs & fields to skip
1 parent b4ee9de commit aae5d97

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

server/mergin/sync/public_api_v2_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ def list_workspace_projects(workspace_id, page, per_page, order_params=None, q=N
443443
)
444444
projects = projects.order_by(*order_by_params)
445445

446-
pagination = projects.paginate(page, per_page)
446+
pagination = projects.paginate(page=page, per_page=per_page)
447447
result = pagination.items
448448
total = pagination.total
449449

server/mergin/utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ def get_schema_fields_map(schema: Type[Schema]) -> dict:
162162
if not field:
163163
continue
164164
# skip virtual fields as DB cannot sort by them
165-
if isinstance(field, (fields.Function, fields.Method)):
165+
if isinstance(
166+
field, (fields.Function, fields.Method, fields.Nested, fields.List)
167+
):
166168
continue
167169
if field.attribute:
168170
mapping[name] = field.attribute

0 commit comments

Comments
 (0)