diff options
author | Cefin <kevon@tuta.io> | 2021-10-10 17:03:32 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-10-25 12:06:03 +0200 |
commit | 37d9c49177a4cf06811f9cb090e893c0e2a721d7 (patch) | |
tree | 06f44747243228426905ed820fa5a2d668401da7 /archaeological_finds | |
parent | 1491ca9d8d8c1a80b58046201674465320e0e1b4 (diff) | |
download | Ishtar-37d9c49177a4cf06811f9cb090e893c0e2a721d7.tar.bz2 Ishtar-37d9c49177a4cf06811f9cb090e893c0e2a721d7.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 c292cd368..a588381d2 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) |