From 0b1fc93dad6e32b3fc88e52a91098a43da25ffd4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 22 Dec 2022 19:19:36 +0100 Subject: Search: sort by ID by default --- ishtar_common/views_item.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'ishtar_common/views_item.py') diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 930cd13e5..58b8e273a 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -2155,16 +2155,17 @@ def get_item( if k.endswith("[column]"): sorts[num][1] = request_items[k] sign = "" - if not sorts and model._meta.ordering: - orders = [k for k in model._meta.ordering] - items = items.order_by(*orders) + if not sorts: + items = items.order_by("id") else: orders = [] + sort_keys = list(sorts.keys()) for idx in sorted(sorts.keys()): signe, col_num = sorts[idx] col_num = int(col_num) - # remove id and link col - if col_num < 2: + # id or link col + if col_num < 2 and len(sort_keys) <= 2: + orders.append("id") continue k = query_table_cols[col_num - 2] if k in request_keys: -- cgit v1.2.3