diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 12 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 9 |
2 files changed, 13 insertions, 8 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index f61bc5f35..a99d6fed4 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -977,6 +977,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect): "base_finds__context_record__operation__person_in_charge", "base_finds__context_record__operation__common_name" "base_finds__context_record__operation__operator", + "base_finds__context_record__operation__address", "base_finds__context_record__town__areas", "archaeological_sites", "archaeological_sites_context_record", @@ -1015,20 +1016,23 @@ class FindSelect(DocumentItemSelect, PeriodSelect): label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'find' )) - address = forms.CharField(label=_("Address")) + base_finds__context_record__operation__address = forms.CharField(label=_("Address")) base_finds__context_record__operation__person_in_charge = forms.IntegerField( label=_("Person in charge"), widget=widgets.JQueryAutoComplete( reverse_lazy("autocomplete-person") - ), + ) ) base_finds__context_record__operation__operator = forms.IntegerField( label=_("Operator"), widget=widgets.JQueryAutoComplete( reverse_lazy("autocomplete-organization") - ), + ) + ) + base_finds__context_record__operation__common_name = forms.CharField( + label=_("Operation name"), + max_length=30 ) - base_finds__context_record__operation__common_name = forms.CharField(label=_("Operation name")) label = forms.CharField(label=_("Free ID")) denomination = forms.CharField(label=_("Denomination")) previous_id = forms.CharField(label=_("Previous ID")) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 58d2f9599..4fee1283c 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1580,12 +1580,13 @@ class Find( pgettext_lazy("key for text search", "functional-area"), "functional_areas__label__iexact", ), - "address": SearchAltName( - pgettext_lazy("key for text search", "address"), "address__icontains" + "base_finds__context_record__operation__address": SearchAltName( + pgettext_lazy("key for text search", "operation-address"), + "base_finds__context_record__operation__address__iexact", ), "base_finds__context_record__operation__person_in_charge": SearchAltName( pgettext_lazy("key for text search", "person-in-charge"), - "base_finds__context_record__operation__person_in_charge__cached_label__iexact", + "base_finds__context_record__operation__in_charge__cached_label__iexact", ), "base_finds__context_record__operation__operator": SearchAltName( pgettext_lazy("key for text search", "operator"), @@ -1593,7 +1594,7 @@ class Find( ), "base_finds__context_record__operation__common_name": SearchAltName( pgettext_lazy("key for text search", "operation-name"), - "base_finds__context_record__operation__common_name__cached_label__icontains", + "base_finds__context_record__operation__common_name__icontains", ), } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) |