summaryrefslogtreecommitdiff
path: root/archaeological_operations/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations/models.py')
-rw-r--r--archaeological_operations/models.py191
1 files changed, 88 insertions, 103 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 7d194074d..e711def95 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -37,7 +37,7 @@ from ishtar_common.models import BaseHistorizedItem, Dashboard, \
OperationType, Organization, OwnPerms, Person, PersonType, \
post_delete_record_relation, post_save_cache, RelationItem, \
ShortMenuItem, SourceType, Town, ValueGetter, get_current_profile, \
- document_attached_changed, HistoryModel
+ document_attached_changed, HistoryModel, SearchAltName
from ishtar_common.utils import cached_label_changed, \
force_cached_label_changed, mode, m2m_historization_changed
@@ -135,81 +135,76 @@ class ArchaeologicalSite(BaseHistorizedItem, OwnPerms, ValueGetter,
# alternative names of fields for searches
ALT_NAMES = {
- 'reference': (
+ 'reference': SearchAltName(
pgettext_lazy("key for text search", u"reference"),
'reference__iexact'
),
- 'name': (
+ 'name': SearchAltName(
pgettext_lazy("key for text search", u"name"),
'name__iexact'
),
- 'periods': (
+ 'periods': SearchAltName(
pgettext_lazy("key for text search", u"period"),
'periods__label__iexact'
),
- 'remains': (
+ 'remains': SearchAltName(
pgettext_lazy("key for text search", u"remain"),
'remains__label__iexact'
),
- 'towns': (
+ 'towns': SearchAltName(
pgettext_lazy("key for text search", u"town"),
'towns__cached_label__iexact'
),
- 'comment': (
+ 'comment': SearchAltName(
pgettext_lazy("key for text search", u"comment"),
'comment__iexact'
),
- 'locality_ngi': (
+ 'locality_ngi': SearchAltName(
pgettext_lazy("key for text search", u"locality-ngi"),
'locality_ngi__iexact'
),
- 'locality_cadastral': (
+ 'locality_cadastral': SearchAltName(
pgettext_lazy("key for text search", u"locality-cadastral"),
'locality_cadastral__iexact'
),
- 'shipwreck_name': (
+ 'shipwreck_name': SearchAltName(
pgettext_lazy("key for text search", u"shipwreck-name"),
'shipwreck_name__iexact'
),
- 'oceanographic_service_localisation': (
+ 'oceanographic_service_localisation': SearchAltName(
pgettext_lazy("key for text search",
u"oceanographic-service-localisation"),
'oceanographic_service_localisation__iexact'
),
- 'shipwreck_code': (
+ 'shipwreck_code': SearchAltName(
pgettext_lazy("key for text search", u"shipwreck-code"),
'shipwreck_code__iexact'
),
- 'sinking_date': (
+ 'sinking_date': SearchAltName(
pgettext_lazy("key for text search", u"sinking-date"),
'sinking_date'
),
- 'discovery_area': (
+ 'discovery_area': SearchAltName(
pgettext_lazy("key for text search", u"discovery-area"),
'discovery_area__iexact'
),
- 'operation': (
+ 'operation': SearchAltName(
pgettext_lazy("key for text search", u"operation"),
'operations__cached_label__icontains'
),
- 'top_operation': (
+ 'top_operation': SearchAltName(
pgettext_lazy("key for text search", u"top-operation"),
'top_operation__cached_label__icontains'
),
- 'drassm_number': (
+ 'drassm_number': SearchAltName(
pgettext_lazy("key for text search", u"numero-drassm"),
'drassm_number__iexact'
),
- 'affmar_number': (
+ 'affmar_number': SearchAltName(
pgettext_lazy("key for text search", u"numero-affmar"),
'affmar_number__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()
UP_MODEL_QUERY = {
"operation": (pgettext_lazy("key for text search", u"operation"),
@@ -592,160 +587,155 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
# alternative names of fields for searches
ALT_NAMES = {
- 'year': (
+ 'year': SearchAltName(
pgettext_lazy("key for text search", u"year"),
'year'
),
- 'operation_code': (
+ 'operation_code': SearchAltName(
pgettext_lazy("key for text search", u"operation-code"),
'operation_code'
),
- 'code_patriarche': (
+ 'code_patriarche': SearchAltName(
pgettext_lazy("key for text search", u"patriarche"),
'code_patriarche__iexact'
),
- 'towns': (
+ 'towns': SearchAltName(
pgettext_lazy("key for text search", u"town"),
'towns__cached_label__iexact'
),
- 'parcel': (
+ 'parcel': SearchAltName(
pgettext_lazy("key for text search", u"parcel"),
'parcels__cached_label__iexact'
),
- 'towns__numero_insee__startswith': (
+ 'towns__numero_insee__startswith': SearchAltName(
pgettext_lazy("key for text search", u"department"),
'towns__numero_insee__startswith'
),
- 'common_name': (
+ 'common_name': SearchAltName(
pgettext_lazy("key for text search", u"name"),
'common_name__iexact'
),
- 'address': (
+ 'address': SearchAltName(
pgettext_lazy("key for text search", u"address"),
'address__iexact'
),
- 'operation_type': (
+ 'operation_type': SearchAltName(
pgettext_lazy("key for text search", u"type"),
'operation_type__label__iexact'
),
- 'end_date': (
+ 'end_date': SearchAltName(
pgettext_lazy("key for text search", u"is-open"),
'end_date__isnull'
),
- 'in_charge': (
+ 'in_charge': SearchAltName(
pgettext_lazy("key for text search", u"in-charge"),
'in_charge__cached_label__iexact'
),
- 'scientist': (
+ 'scientist': SearchAltName(
pgettext_lazy("key for text search", u"scientist"),
'scientist__cached_label__iexact'
),
- 'operator': (
+ 'operator': SearchAltName(
pgettext_lazy("key for text search", u"operator"),
'operator__cached_label__iexact'
),
- 'remains': (
+ 'remains': SearchAltName(
pgettext_lazy("key for text search", u"remain"),
'remains__label__iexact'
),
- 'periods': (
+ 'periods': SearchAltName(
pgettext_lazy("key for text search", u"period"),
'periods__label__iexact'
),
- 'start_before': (
+ 'start_before': SearchAltName(
pgettext_lazy("key for text search", u"start-before"),
'start_date__lte'
),
- 'start_after': (
+ 'start_after': SearchAltName(
pgettext_lazy("key for text search", u"start-after"),
'start_date__gte'
),
- 'end_before': (
+ 'end_before': SearchAltName(
pgettext_lazy("key for text search", u"end-before"),
'excavation_end_date__lte'
),
- 'end_after': (
+ 'end_after': SearchAltName(
pgettext_lazy("key for text search", u"end-after"),
'excavation_end_date__gte'
),
- 'relation_types': (
+ 'relation_types': SearchAltName(
pgettext_lazy("key for text search", u"relation-types"),
'relation_types'
),
- 'comment': (
+ 'comment': SearchAltName(
pgettext_lazy("key for text search", u"comment"),
'comment__iexact'
),
- 'abstract': (
+ 'abstract': SearchAltName(
pgettext_lazy("key for text search", u"abstract"),
'abstract__iexact'
),
- 'scientific_documentation_comment': (
+ 'scientific_documentation_comment': SearchAltName(
pgettext_lazy("key for text search",
u"scientific-documentation-comment"),
'scientific_documentation_comment__iexact'
),
- 'record_quality_type': (
+ 'record_quality_type': SearchAltName(
pgettext_lazy("key for text search", u"record-quality"),
'record_quality_type__label__iexact'
),
- 'report_processing': (
+ 'report_processing': SearchAltName(
pgettext_lazy("key for text search",
u"report-processing"),
'report_processing__label__iexact'
),
- 'virtual_operation': (
+ 'virtual_operation': SearchAltName(
pgettext_lazy("key for text search",
u"virtual-operation"),
'virtual_operation'
),
- 'archaeological_sites': (
+ 'archaeological_sites': SearchAltName(
pgettext_lazy("key for text search",
u"site"),
'archaeological_sites__cached_label__icontains'
),
- 'history_creator': (
+ 'history_creator': SearchAltName(
pgettext_lazy("key for text search", u"created-by"),
'history_creator__ishtaruser__person__cached_label__iexact'
),
- 'history_modifier': (
+ 'history_modifier': SearchAltName(
pgettext_lazy("key for text search", u"modified-by"),
'history_modifier__ishtaruser__person__cached_label__iexact'
),
- 'documentation_received': (
+ 'documentation_received': SearchAltName(
pgettext_lazy("key for text search", u"documentation-received"),
'documentation_received'
),
- 'documentation_deadline_before': (
+ 'documentation_deadline_before': SearchAltName(
pgettext_lazy("key for text search", u"documentation-deadline-before"),
'documentation_deadline__lte'
),
- 'documentation_deadline_after': (
+ 'documentation_deadline_after': SearchAltName(
pgettext_lazy("key for text search", u"documentation-deadline-after"),
'documentation_deadline__gte'
),
- 'finds_received': (
+ 'finds_received': SearchAltName(
pgettext_lazy("key for text search", u"finds-received"),
'finds_received'
),
- 'finds_deadline_before': (
+ 'finds_deadline_before': SearchAltName(
pgettext_lazy("key for text search", u"finds-deadline-before"),
'finds_deadline__lte'
),
- 'finds_deadline_after': (
+ 'finds_deadline_after': SearchAltName(
pgettext_lazy("key for text search", u"finds-deadline-after"),
'finds_deadline__gte'
),
- 'drassm_code': (
+ 'drassm_code': SearchAltName(
pgettext_lazy("key for text search", u"code-drassm"),
'drassm_code__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()
UP_MODEL_QUERY = {
"site": (pgettext_lazy("key for text search", u"site"),
@@ -1602,153 +1592,148 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
'treatment']
# alternative names of fields for searches
ALT_NAMES = {
- 'year': (
+ 'year': SearchAltName(
pgettext_lazy("key for text search", u"year"),
'signature_date__year'
),
- 'index': (
+ 'index': SearchAltName(
pgettext_lazy("key for text search", u"index"),
'index'
),
- 'ref_sra': (
+ 'ref_sra': SearchAltName(
pgettext_lazy("key for text search", u"other-ref"),
'ref_sra__iexact'
),
- 'operation__code_patriarche': (
+ 'operation__code_patriarche': SearchAltName(
pgettext_lazy("key for text search", u"patriarche"),
'operation__code_patriarche'
),
- 'act_type': (
+ 'act_type': SearchAltName(
pgettext_lazy("key for text search", u"type"),
'act_type__label__iexact'
),
- 'indexed': (
+ 'indexed': SearchAltName(
pgettext_lazy("key for text search", u"indexed"),
'index__isnull'
),
- 'operation__towns': (
+ 'operation__towns': SearchAltName(
pgettext_lazy("key for text search", u"operation-town"),
'operation__towns__cached_label__iexact'
),
- 'associated_file__towns': (
+ 'associated_file__towns': SearchAltName(
pgettext_lazy("key for text search", u"file-town"),
'associated_file__towns__cached_label__iexact'
),
- 'parcel': (
+ 'parcel': SearchAltName(
pgettext_lazy("key for text search", u"parcel"),
('associated_file__parcels__cached_label__iexact',
'operation__parcels__cached_label__iexact',
'operation__associated_file__parcels__cached_label__iexact'),
),
- 'operation__towns__numero_insee__startswith': (
+ 'operation__towns__numero_insee__startswith': SearchAltName(
pgettext_lazy("key for text search", u"operation-department"),
'operation__towns__numero_insee__startswith'
),
- 'associated_file__towns__numero_insee__startswith': (
+ 'associated_file__towns__numero_insee__startswith': SearchAltName(
pgettext_lazy("key for text search", u"file-department"),
'associated_file__towns__numero_insee__startswith'
),
- 'act_object': (
+ 'act_object': SearchAltName(
pgettext_lazy("key for text search", u"object"),
'act_object__icontains'
),
- 'history_creator': (
+ 'history_creator': SearchAltName(
pgettext_lazy("key for text search", u"created-by"),
'history_creator__ishtaruser__person__cached_label__iexact'
),
- 'history_modifier': (
+ 'history_modifier': SearchAltName(
pgettext_lazy("key for text search", u"modified-by"),
'history_modifier__ishtaruser__person__cached_label__iexact'
),
- 'signature_date_before': (
+ 'signature_date_before': SearchAltName(
pgettext_lazy("key for text search", u"signature-before"),
'signature_date__lte'
),
- 'signature_date_after': (
+ 'signature_date_after': SearchAltName(
pgettext_lazy("key for text search", u"signature-after"),
'signature_date__gte'
),
- 'associated_file__name': (
+ 'associated_file__name': SearchAltName(
pgettext_lazy("key for text search", u"file-name"),
'associated_file__name__icontains'
),
- 'associated_file__general_contractor': (
+ 'associated_file__general_contractor': SearchAltName(
pgettext_lazy("key for text search", u"general-contractor"),
'associated_file__general_contractor__cached_label__iexact'
),
- 'associated_file__general_contractor__attached_to': (
+ 'associated_file__general_contractor__attached_to': SearchAltName(
pgettext_lazy("key for text search",
u"general-contractor-organization"),
'associated_file__general_contractor__attached_to'
'__cached_label__iexact'
),
- 'associated_file__numeric_reference': (
+ 'associated_file__numeric_reference': SearchAltName(
pgettext_lazy("key for text search", u"file-reference"),
'associated_file__numeric_reference'
),
- 'associated_file__year': (
+ 'associated_file__year': SearchAltName(
pgettext_lazy("key for text search", u"file-year"),
'associated_file__year'
),
- 'associated_file__internal_reference': (
+ 'associated_file__internal_reference': SearchAltName(
pgettext_lazy("key for text search", u"file-other-reference"),
'associated_file__internal_reference__iexact'
),
- 'associated_file__in_charge': (
+ 'associated_file__in_charge': SearchAltName(
pgettext_lazy("key for text search", u"file-in-charge"),
'associated_file__in_charge__cached_label__iexact'
),
- 'associated_file__permit_reference': (
+ 'associated_file__permit_reference': SearchAltName(
pgettext_lazy("key for text search", u"file-permit-reference"),
'associated_file__permit_reference__iexact'
),
- 'treatment__name': (
+ 'treatment__name': SearchAltName(
pgettext_lazy("key for text search", u"treatment-name"),
'treatment__label__icontains'
),
- 'treatment__other_reference': (
+ 'treatment__other_reference': SearchAltName(
pgettext_lazy("key for text search", u"treatment-reference"),
'treatment__other_reference__icontains'
),
- 'treatment__year': (
+ 'treatment__year': SearchAltName(
pgettext_lazy("key for text search", u"treatment-year"),
'treatment__year'
),
- 'treatment__index': (
+ 'treatment__index': SearchAltName(
pgettext_lazy("key for text search", u"treatment-index"),
'treatment__index'
),
- 'treatment__treatment_types': (
+ 'treatment__treatment_types': SearchAltName(
pgettext_lazy("key for text search", u"treatment-type"),
'treatment__treatment_types__label__iexact'
),
- 'treatment_file__name': (
+ 'treatment_file__name': SearchAltName(
pgettext_lazy("key for text search", u"treatment-file-name"),
'treatment_file__name__icontains'
),
- 'treatment_file__internal_reference': (
+ 'treatment_file__internal_reference': SearchAltName(
pgettext_lazy("key for text search", u"treatment-file-reference"),
'treatment_file__internal_reference__icontains'
),
- 'treatment_file__year': (
+ 'treatment_file__year': SearchAltName(
pgettext_lazy("key for text search", u"treatment-file-year"),
'treatment_file__year'
),
- 'treatment_file__index': (
+ 'treatment_file__index': SearchAltName(
pgettext_lazy("key for text search", u"treatment-file-index"),
'treatment_file__index'
),
- 'treatment_file__type': (
+ 'treatment_file__type': SearchAltName(
pgettext_lazy("key for text search", u"treatment-file-type"),
'treatment_file__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()
UP_MODEL_QUERY = {}
POST_PROCESS_REQUEST = {
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 18:23:52 +0000