diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-05-09 12:36:12 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-05-09 12:36:12 +0200 |
| commit | b5a676684f3a4b85682934a6c1c251559131be28 (patch) | |
| tree | 9740239cfaa28bf79b1adf35f6602091ae1d7cb9 /ishtar_common/models_common.py | |
| parent | e770c12bf36346d7f7580e20ea3f1c4386a94ee3 (diff) | |
| download | Ishtar-b5a676684f3a4b85682934a6c1c251559131be28.tar.bz2 Ishtar-b5a676684f3a4b85682934a6c1c251559131be28.zip | |
🐛 fix hierarchical ordering in admin and forms (refs #5797)
Diffstat (limited to 'ishtar_common/models_common.py')
| -rw-r--r-- | ishtar_common/models_common.py | 5 |
1 files changed, 4 insertions, 1 deletions
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(): |