From c2335366bb0a01dde8404631f7f8dce3e584937d Mon Sep 17 00:00:00 2001 From: Donkie Date: Fri, 2 Feb 2024 22:10:11 +0100 Subject: [PATCH] Fixed sorting by remaining weight/length --- spoolman/database/spool.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spoolman/database/spool.py b/spoolman/database/spool.py index f71a40b..dfbaad8 100644 --- a/spoolman/database/spool.py +++ b/spoolman/database/spool.py @@ -149,9 +149,8 @@ async def find( if sort_by is not None: for fieldstr, order in sort_by.items(): sorts = [] - if fieldstr == "remaining_weight": - stmt = stmt.add_columns((models.Filament.weight - models.Spool.used_weight).label("remaining_weight")) - sorts.append(sqlalchemy.column("remaining_weight")) + if fieldstr in {"remaining_weight", "remaining_length"}: + sorts.append(models.Filament.weight - models.Spool.used_weight) elif fieldstr == "filament.combined_name": sorts.append(models.Vendor.name) sorts.append(models.Filament.name)