diff --git a/server/mergin/sync/public_api_controller.py b/server/mergin/sync/public_api_controller.py index f8b88cd1..22a4ef5a 100644 --- a/server/mergin/sync/public_api_controller.py +++ b/server/mergin/sync/public_api_controller.py @@ -608,8 +608,9 @@ def get_paginated_projects( public, only_public, ) - result = projects.paginate(page, per_page).items - total = projects.paginate().total + pagination = projects.paginate(page, per_page) + result = pagination.items + total = pagination.total # create user map id:username passed to project schema to minimize queries to db projects_ids = [p.id for p in result] diff --git a/server/mergin/utils.py b/server/mergin/utils.py index 7b062770..d61b06d8 100644 --- a/server/mergin/utils.py +++ b/server/mergin/utils.py @@ -60,7 +60,7 @@ def get_order_param( attr = None order_attr = cls.__table__.c.get(col, None) if not isinstance(order_attr, Column): - logging.warning("Ignoring invalid order parameter.") + logging.warning(f"Ignoring invalid order parameter: {order_param}.") return # sort by key in JSON field if attr: diff --git a/web-app/packages/lib/src/assets/sass/theme-base/_mixins.scss b/web-app/packages/lib/src/assets/sass/theme-base/_mixins.scss index 7db81588..076d5c2b 100644 --- a/web-app/packages/lib/src/assets/sass/theme-base/_mixins.scss +++ b/web-app/packages/lib/src/assets/sass/theme-base/_mixins.scss @@ -30,7 +30,7 @@ @mixin invalid-input() { border-color: $inputErrorBorderColor; background-color: $inputErrorBackgroundColor; - box-shadow: inset 0 0 0 1px $inputErrorBorderColor; + box-shadow: inset 0 0 0 2px $inputErrorBorderColor; } @mixin menuitem {