From b5a676684f3a4b85682934a6c1c251559131be28 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 9 May 2024 12:36:12 +0200 Subject: 🐛 fix hierarchical ordering in admin and forms (refs #5797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/models_common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ishtar_common/models_common.py') diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index b2cf02ef9..98c0c6933 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -491,8 +491,11 @@ class GeneralType(Cached, models.Model): childs = cls.objects.filter(**dct) if exclude: childs = childs.exclude(txt_idx__in=exclude) - if hasattr(cls, "order"): + ordering = cls._meta.ordering + if not ordering and hasattr(cls, "order"): childs = childs.order_by("order") + else: + childs = childs.order_by(*ordering) res = {} if instances: for item in childs.all(): -- cgit v1.2.3