summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-20 16:30:27 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-20 16:30:27 +0100
commitc07ba0fac651ddc1f78a05a2a0af9f744d80a324 (patch)
tree4ad7143b98184e608b7b39f9f68a6868689d9c88
parentac556eb088952c971775a53bc8ac6023dccf459b (diff)
downloadIshtar-c07ba0fac651ddc1f78a05a2a0af9f744d80a324.tar.bz2
Ishtar-c07ba0fac651ddc1f78a05a2a0af9f744d80a324.zip
Fix discovery date search
-rw-r--r--archaeological_finds/forms.py10
-rw-r--r--archaeological_finds/models_finds.py10
2 files changed, 1 insertions, 19 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index e4248aeac..4772ffe89 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -1277,8 +1277,6 @@ class FindSelect(GeoItemSelect, PeriodSelect):
[
"base_finds__discovery_date__before",
"base_finds__discovery_date__after",
- "base_finds__discovery_date_tpq__before",
- "base_finds__discovery_date_tpq__after",
"base_finds__discovery_date_taq__before",
"base_finds__discovery_date_taq__after",
],
@@ -1425,15 +1423,9 @@ class FindSelect(GeoItemSelect, PeriodSelect):
description = forms.CharField(label=_("Description"))
base_finds__discovery_date__after = forms.DateField(
- label=_("Discovery date after"), widget=DatePicker
- )
- base_finds__discovery_date__before = forms.DateField(
- label=_("Discovery date before"), widget=DatePicker
- )
- base_finds__discovery_date_tpq__after = forms.DateField(
label=_("Discovery date (exact or beginning) after"), widget=DatePicker
)
- base_finds__discovery_date_tpq__before = forms.DateField(
+ base_finds__discovery_date__before = forms.DateField(
label=_("Discovery date (exact or beginning) before"), widget=DatePicker
)
base_finds__discovery_date_taq__after = forms.DateField(
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 05321be50..8da525281 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1191,8 +1191,6 @@ class Find(
"treatments__end_date__lte",
"base_finds__discovery_date__lte",
"base_finds__discovery_date__gte",
- "base_finds__discovery_date_tpq__lte",
- "base_finds__discovery_date_tpq__gte",
"base_finds__discovery_date_taq__lte",
"base_finds__discovery_date_taq__gte",
"check_date__lte",
@@ -1406,14 +1404,6 @@ class Find(
pgettext_lazy("key for text search", "discovery-date-after"),
"base_finds__discovery_date__gte",
),
- "base_finds__discovery_date_tpq__before": SearchAltName(
- pgettext_lazy("key for text search", "discovery-date-tpq-before"),
- "base_finds__discovery_date_tpq__lte",
- ),
- "base_finds__discovery_date_tpq__after": SearchAltName(
- pgettext_lazy("key for text search", "discovery-date-tpq-after"),
- "base_finds__discovery_date_tpq__gte",
- ),
"base_finds__discovery_date_taq__before": SearchAltName(
pgettext_lazy("key for text search", "discovery-date-taq-before"),
"base_finds__discovery_date_taq__lte",