diff options
| -rw-r--r-- | ishtar_common/models.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index b3439a257..fa1556658 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3060,14 +3060,14 @@ class OperationType(GeneralType): dct['available'] = True if not instances and empty_first and not default: tuples.append(('', '--')) - if default: + if default and not instances: try: default = cls.objects.get(txt_idx=default) tuples.append((default.pk, _(unicode(default)))) except cls.DoesNotExist: pass items = cls.objects.filter(**dct) - if default: + if default and not instances: exclude.append(default.txt_idx) if exclude: items = items.exclude(txt_idx__in=exclude) @@ -3077,6 +3077,10 @@ class OperationType(GeneralType): instance=True) item_list += new_vals for item in item_list: + item.rank = 0 + if instances: + return item_list + for item in item_list: if not current_lst or item.preventive != current_preventive: if current_lst: tuples.append(current_lst) |