From 0e0dc8de9a65fa493513d0aa3d1ed53906df1018 Mon Sep 17 00:00:00 2001 From: Cefin Date: Sun, 10 Oct 2021 17:22:25 +0200 Subject: adding operator on finds search --- archaeological_finds/forms.py | 12 +++++++++--- archaeological_finds/models_finds.py | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index caa666e9a..6a287a45c 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -974,7 +974,8 @@ class FindSelect(DocumentItemSelect, PeriodSelect): "base_finds__context_record__operation__operation_code", "base_finds__context_record__operation__code_patriarche", "base_finds__context_record__operation__operation_type", - "base_finds__context_record__operation__person_in_charge" + "base_finds__context_record__operation__person_in_charge", + "base_finds__context_record__operation__operator", "base_finds__context_record__town__areas", "archaeological_sites", "archaeological_sites_context_record", @@ -1017,9 +1018,14 @@ class FindSelect(DocumentItemSelect, PeriodSelect): base_finds__context_record__operation__person_in_charge = forms.IntegerField( label=_("Person in charge"), widget=widgets.JQueryAutoComplete( - reverse_lazy("autocomplete-person")#, associated_model=Person + reverse_lazy("autocomplete-person") + ), + ) + base_finds__context_record__operation__operator = forms.IntegerField( + label=_("Operator"), + widget=widgets.JQueryAutoComplete( + reverse_lazy("autocomplete-organization") ), - #validators=[valid_id(Person)], ) label = forms.CharField(label=_("Free ID")) denomination = forms.CharField(label=_("Denomination")) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index a588381d2..2bb4ee7e8 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1586,6 +1586,10 @@ class Find( "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__operator": SearchAltName( + pgettext_lazy("key for text search", "operator"), + "base_finds__context_record__operation__operator__cached_label_iexact", ) } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) -- cgit v1.2.3