From 9b3ede3e6d5d2b076975c188454a39c2b45d155d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 14 Dec 2013 23:51:21 +0100 Subject: Set Non Precised by default (if available) for permit types --- ishtar_common/models.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 8d153f120..aacc9f2d0 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -230,20 +230,30 @@ class GeneralType(models.Model): return u"" @classmethod - def get_types(cls, dct={}, instances=False, exclude=[], empty_first=True): + def get_types(cls, dct={}, instances=False, exclude=[], empty_first=True, + default=None): base_dct = dct.copy() if hasattr(cls, 'parent'): return cls._get_parent_types(base_dct, instances, exclude=exclude, - empty_first=empty_first) + empty_first=empty_first, default=default) return cls._get_types(base_dct, instances, exclude=exclude, - empty_first=empty_first) + empty_first=empty_first, default=default) @classmethod - def _get_types(cls, dct={}, instances=False, exclude=[], empty_first=True): + def _get_types(cls, dct={}, instances=False, exclude=[], empty_first=True, + default=None): dct['available'] = True - if not instances and empty_first: + if not instances and empty_first and not default: yield ('', '--') + if default: + try: + default = cls.objects.get(txt_idx=default) + yield(default.pk, _(unicode(default))) + except cls.DoesNotExist: + pass items = cls.objects.filter(**dct) + if default: + exclude.append(default.txt_idx) if exclude: items = items.exclude(txt_idx__in=exclude) for item in items.order_by(*cls._meta.ordering).all(): @@ -277,7 +287,7 @@ class GeneralType(models.Model): @classmethod def _get_parent_types(cls, dct={}, instances=False, exclude=[], - empty_first=True): + empty_first=True, default=None): dct['available'] = True if not instances and empty_first: yield ('', '--') -- cgit v1.2.3