diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-09-02 08:38:11 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-09-02 08:38:11 +0200 |
commit | 7425ac6cb4b08a2933805b0de4594a2efbeacb32 (patch) | |
tree | eff63a9fcd55836d7c19ca2261a012482061758b /archaeological_operations | |
parent | 7e7f4b81a8d7ec665c8945ef2ef26c9d5f13a66d (diff) | |
download | Ishtar-7425ac6cb4b08a2933805b0de4594a2efbeacb32.tar.bz2 Ishtar-7425ac6cb4b08a2933805b0de4594a2efbeacb32.zip |
Search - criteria: "has finds" for operation and context record search
Diffstat (limited to 'archaeological_operations')
-rw-r--r-- | archaeological_operations/forms.py | 1 | ||||
-rw-r--r-- | archaeological_operations/models.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 02f5ec326..8613822e1 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -566,6 +566,7 @@ class OperationSelect(DocumentItemSelect): label=_(u"Documentation deadline before")) documentation_deadline_after = DateField( label=_(u"Documentation deadline after")) + has_finds = forms.NullBooleanField(label=_("Has finds")) finds_received = forms.NullBooleanField( label=_(u"Finds received")) finds_deadline_before = DateField( diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index a74ab7d51..db63088e5 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -700,6 +700,7 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, # search parameters BOOL_FIELDS = ['end_date__isnull', 'virtual_operation', 'documentation_received', 'finds_received'] + MANY_COUNTED_FIELDS = ['context_record__base_finds'] REVERSED_BOOL_FIELDS = [ 'documents__image__isnull', 'documents__associated_file__isnull', @@ -948,6 +949,10 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem, QRCodeItem, pgettext_lazy("key for text search", "finds-received"), 'finds_received' ), + 'has_finds': SearchAltName( + pgettext_lazy("key for text search", "has-finds"), + 'context_record__base_finds' + ), 'finds_deadline_before': SearchAltName( pgettext_lazy("key for text search", "finds-deadline-before"), 'finds_deadline__lte' |