diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-13 19:13:25 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-13 19:13:25 +0100 |
| commit | afeb9ccb2babc91a0541261ecb6549d09d6c3d7c (patch) | |
| tree | 628f9d0a263345fc4b1d5c7ca5fe37721337c777 /archaeological_finds | |
| parent | 4b85abf7d04adc7a02a8a269a116adc1f22d6fc6 (diff) | |
| download | Ishtar-afeb9ccb2babc91a0541261ecb6549d09d6c3d7c.tar.bz2 Ishtar-afeb9ccb2babc91a0541261ecb6549d09d6c3d7c.zip | |
Search: add fields for container search - add site for find search
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 738b634e9..d5ce0e025 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -920,12 +920,18 @@ class FindSelect(HistorySelect): reverse_lazy('autocomplete-archaeologicalsite'), associated_model=ArchaeologicalSite), validators=[valid_id(ArchaeologicalSite)]) + archaeological_sites_name = forms.CharField( + label=_(u"Archaeological site name (attached to the operation)") + ) archaeological_sites_context_record = forms.IntegerField( label=_("Archaeological site (attached to the context record)"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-archaeologicalsite'), associated_model=ArchaeologicalSite), validators=[valid_id(ArchaeologicalSite)]) + archaeological_sites_context_record_name = forms.CharField( + label=_(u"Archaeological site name (attached to the context record)") + ) base_finds__context_record = forms.IntegerField( label=_("Context record"), widget=widgets.JQueryAutoComplete( diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 6f8199412..541fe2df1 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -867,11 +867,22 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, pgettext_lazy("key for text search", u"site"), 'base_finds__context_record__operation__archaeological_sites__' 'cached_label__icontains'), + 'archaeological_sites_name': + SearchAltName( + pgettext_lazy("key for text search", u"site-name"), + 'base_finds__context_record__operation__archaeological_sites__' + 'name__iexact'), 'archaeological_sites_context_record': SearchAltName( pgettext_lazy("key for text search", u"context-record-site"), 'base_finds__context_record__archaeological_site__' 'cached_label__icontains'), + 'archaeological_sites_context_record_name': + SearchAltName( + pgettext_lazy("key for text search", + u"context-record-site-name"), + 'base_finds__context_record__archaeological_site__' + 'name__iexact'), 'base_finds__context_record': SearchAltName( pgettext_lazy("key for text search", u"context-record"), |