Search: manage dynamic query parameters (ex: divisions details)

1 files changed, 15 insertions, 25 deletions

diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index a8c48a3ad..7d9b8ebb6 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -37,7 +37,7 @@ from ishtar_common.models import Document, GeneralType, \
     ImageModel, BaseHistorizedItem, OwnPerms, HistoricalRecords, Person, \
     Organization, ValueGetter, post_save_cache, ShortMenuItem, \
     DashboardFormItem, ExternalIdManager, document_attached_changed, \
-    HistoryModel
+    HistoryModel, SearchAltName
 from ishtar_common.utils import cached_label_changed, get_current_year, \
     update_data, m2m_historization_changed
 
@@ -92,36 +92,31 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
 
     # alternative names of fields for searches
     ALT_NAMES = {
-        'label': (
+        'label': SearchAltName(
             pgettext_lazy("key for text search", u"label"),
             'label__iexact'
         ),
-        'other_reference': (
+        'other_reference': SearchAltName(
             pgettext_lazy("key for text search", u"other-reference"),
             'other_reference__iexact'
         ),
-        'year': (
+        'year': SearchAltName(
             pgettext_lazy("key for text search", u"year"),
             'year'
         ),
-        'index': (
+        'index': SearchAltName(
             pgettext_lazy("key for text search", u"index"),
             'index'
         ),
-        'documents__image__isnull': (
+        'documents__image__isnull': SearchAltName(
             pgettext_lazy("key for text search", u"has-image"),
             'documents__image__isnull'
         ),
-        'treatment_types': (
+        'treatment_types': SearchAltName(
             pgettext_lazy("key for text search", u"type"),
             'treatment_types__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()
     HISTORICAL_M2M = [
         'treatment_types',
     ]
@@ -871,44 +866,39 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem,
     EXTRA_REQUEST_KEYS = {}
     # alternative names of fields for searches
     ALT_NAMES = {
-        'name': (
+        'name': SearchAltName(
             pgettext_lazy("key for text search", u"name"),
             'name__iexact'
         ),
-        'internal_reference': (
+        'internal_reference': SearchAltName(
             pgettext_lazy("key for text search", u"reference"),
             'internal_reference__iexact'
         ),
-        'year': (
+        'year': SearchAltName(
             pgettext_lazy("key for text search", u"year"),
             'year'
         ),
-        'index': (
+        'index': SearchAltName(
             pgettext_lazy("key for text search", u"index"),
             'index'
         ),
-        'type': (
+        'type': SearchAltName(
             pgettext_lazy("key for text search", u"type"),
             'type__label__iexact'
         ),
-        'in_charge': (
+        'in_charge': SearchAltName(
             pgettext_lazy("key for text search", u"in-charge"),
             'in_charge__cached_label__iexact'
         ),
-        'applicant': (
+        'applicant': SearchAltName(
             pgettext_lazy("key for text search", u"applicant"),
             'applicant__cached_label__iexact'
         ),
-        'applicant_organisation': (
+        'applicant_organisation': SearchAltName(
             pgettext_lazy("key for text search", u"applicant-organisation"),
             'applicant_organisation__cached_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()
 
     # fields
     year = models.IntegerField(_(u"Year"), default=get_current_year)