diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-11 17:46:46 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-12-11 17:46:46 +0100 |
| commit | 52b513e0737f65e30b5e886f728a7fae16ace4c2 (patch) | |
| tree | 5f60291fe22fc689f608ffc0ea8aeea9f7cd085f /ishtar_common/models.py | |
| parent | 38c111ec8b259158c152472ea96d070da2d39386 (diff) | |
| download | Ishtar-52b513e0737f65e30b5e886f728a7fae16ace4c2.tar.bz2 Ishtar-52b513e0737f65e30b5e886f728a7fae16ace4c2.zip | |
Administrative act for treatment and treatment files
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 25fa73132..d4f0c595e 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -413,6 +413,8 @@ class GeneralType(Cached, models.Model): new_vals = [] if not initial: return [] + if type(initial) not in (list, tuple): + initial = [initial] for value in initial: try: pk = int(value) @@ -486,7 +488,10 @@ class GeneralType(Cached, models.Model): pass items = cls.objects.filter(**dct) if default and default != "None": - exclude.append(default.txt_idx) + if hasattr(default, 'txt_idx'): + exclude.append(default.txt_idx) + else: + exclude.append(default) if exclude: items = items.exclude(txt_idx__in=exclude) for item in items.order_by(*cls._meta.ordering).all(): |