diff options
| author | Cefin <kevon@tuta.io> | 2021-10-10 17:03:32 +0200 |
|---|---|---|
| committer | Cefin <kevon@tuta.io> | 2021-10-13 10:57:40 +0200 |
| commit | e98320650c9f467083d2fce690af071fac377816 (patch) | |
| tree | c90b3f5ce22b5536805bae3e06101dae0dc7b939 /archaeological_finds | |
| parent | ba808114c4548b3aa0e8f0b3a47a809c5e0e1952 (diff) | |
| download | Ishtar-e98320650c9f467083d2fce690af071fac377816.tar.bz2 Ishtar-e98320650c9f467083d2fce690af071fac377816.zip | |
adding search by person-in-charge on finds
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 9 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index a2326e4f2..caa666e9a 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -974,6 +974,7 @@ 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__town__areas", "archaeological_sites", "archaeological_sites_context_record", @@ -1012,6 +1013,14 @@ class FindSelect(DocumentItemSelect, PeriodSelect): label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-finds', 'find' )) + 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")#, associated_model=Person + ), + #validators=[valid_id(Person)], + ) 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 706a2bbbf..f3c0ee132 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1580,6 +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__person_in_charge": SearchAltName( + pgettext_lazy("key for text search", "person-in-charge"), + "base_finds__context_record__operation__person_in_charge__cached_label__iexact", + ) } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) ALT_NAMES.update(DocumentItem.ALT_NAMES) |