diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-20 14:55:11 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-20 15:47:14 +0200 |
| commit | df7b7527db7936d9a5014cd121525a36dbf57531 (patch) | |
| tree | bca9afb0099135323ffe3c135f421b268f20fa0d /archaeological_context_records | |
| parent | 038d2ddee75aaccf0ad0c60d66efe09de69958e8 (diff) | |
| download | Ishtar-df7b7527db7936d9a5014cd121525a36dbf57531.tar.bz2 Ishtar-df7b7527db7936d9a5014cd121525a36dbf57531.zip | |
✨ context records, finds search: add new fields
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index fe6534ea8..057d2996d 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -157,6 +157,12 @@ class RecordSelect(GeoItemSelect, PeriodSelect): label=_("Search within related operations"), choices=[] ) unit = forms.ChoiceField(label=_("Type"), choices=[]) + excavator = forms.IntegerField( + label=_("Excavator"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-person'), + associated_model=Person), + validators=[valid_id(Person)], required=False) activity = forms.ChoiceField(label=_("Activity"), choices=[]) identifications = forms.ChoiceField(label=_("Identification"), choices=[]) cultural_attributions = forms.ChoiceField( diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index a832e2476..efef8cce0 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -608,7 +608,8 @@ class ContextRecord( "archaeological_sites": "operation__archaeological_sites__pk", "cached_label": "cached_label__icontains", "datings__period__label": "datings__period__label", - "operation_id": "operation_id", + "operation_id": "operation_id", # dynamic_table_documents + "excavator_id": "excavator_id", # dynamic_table_documents "unit__label": "unit__label", } MANY_COUNTED_FIELDS = ["base_finds__isnull"] @@ -733,6 +734,10 @@ class ContextRecord( pgettext_lazy("key for text search", "color-details"), "details_on_color__iexact" ), + "excavator": SearchAltName( + pgettext_lazy("key for text search", "excavator"), + "excavator__cached_label__iexact", + ), } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) ALT_NAMES.update(DocumentItem.ALT_NAMES) @@ -751,7 +756,7 @@ class ContextRecord( SearchVectorConfig("datings_comment", "local"), SearchVectorConfig("unit__label"), SearchVectorConfig("activity__label"), - SearchVectorConfig("excavator__raw_name", "raw"), + SearchVectorConfig("excavator__cached_label", "raw"), ] M2M_SEARCH_VECTORS = [ SearchVectorConfig("datings__period__label", "local"), |