diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-16 18:10:46 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-16 18:10:46 +0200 |
commit | 5b6714f7e9776b815c05a40fa16abc4ed2223b30 (patch) | |
tree | 7b4a85964bac71dff3a0946564774639c0ad6550 | |
parent | e278c19588150af3ce63bc5687548dc27087f978 (diff) | |
download | Ishtar-5b6714f7e9776b815c05a40fa16abc4ed2223b30.tar.bz2 Ishtar-5b6714f7e9776b815c05a40fa16abc4ed2223b30.zip |
Ordering operation types
-rw-r--r-- | archaeological_operations/models.py | 1 | ||||
-rw-r--r-- | ishtar_common/models.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 02ec1a912..d7dc18b3c 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -38,6 +38,7 @@ class OperationType(GeneralType): class Meta: verbose_name = _(u"Operation type") verbose_name_plural = _(u"Operation types") + ordering = ['label'] @classmethod def is_preventive(cls, ope_type_id, key=''): diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3e428999e..458802087 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -206,7 +206,7 @@ class GeneralType(models.Model): items = cls.objects.filter(**dct) if exclude: items = items.exclude(txt_idx__in=exclude) - for item in items.all(): + for item in items.order_by(*cls._meta.ordering).all(): if instances: item.rank = 0 yield item |