diff options
Diffstat (limited to 'archaeological_warehouse/models.py')
| -rw-r--r-- | archaeological_warehouse/models.py | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 65b5728f9..34ccba88d 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -32,7 +32,7 @@ from ishtar_common.data_importer import post_importer_action from ishtar_common.models import Document, GeneralType, get_external_id, \ LightHistorizedItem, OwnPerms, Address, Person, post_save_cache, \ ImageModel, DashboardFormItem, ExternalIdManager, ShortMenuItem, \ - document_attached_changed + document_attached_changed, SearchAltName from ishtar_common.utils import cached_label_changed @@ -58,20 +58,16 @@ class Warehouse(Address, DashboardFormItem, OwnPerms, EXTRA_REQUEST_KEYS = {} # alternative names of fields for searches ALT_NAMES = { - 'name': ( + 'name': SearchAltName( pgettext_lazy("key for text search", u"name"), 'name__iexact' ), - 'warehouse_type': ( + 'warehouse_type': SearchAltName( pgettext_lazy("key for text search", u"type"), 'warehouse_type__label__iexact' ), } - for v in ALT_NAMES.values(): - for language_code, language_lbl in settings.LANGUAGES: - activate(language_code) - EXTRA_REQUEST_KEYS[unicode(v[0])] = v[1] - deactivate() + objects = ExternalIdManager() name = models.CharField(_(u"Name"), max_length=200) @@ -355,28 +351,24 @@ class Container(LightHistorizedItem, ImageModel, OwnPerms): # alternative names of fields for searches ALT_NAMES = { - 'location_name': ( + 'location_name': SearchAltName( pgettext_lazy("key for text search", u"location"), 'location__name__iexact' ), - 'responsible_name': ( + 'responsible_name': SearchAltName( pgettext_lazy("key for text search", u"responsible-warehouse"), 'responsible__name__iexact' ), - 'container_type': ( + 'container_type': SearchAltName( pgettext_lazy("key for text search", u"type"), 'container_type__label__iexact' ), - 'reference': ( + 'reference': SearchAltName( pgettext_lazy("key for text search", u"reference"), 'reference__iexact' ), } - for v in ALT_NAMES.values(): - for language_code, language_lbl in settings.LANGUAGES: - activate(language_code) - EXTRA_REQUEST_KEYS[unicode(v[0])] = v[1] - deactivate() + objects = ExternalIdManager() # fields |