From 915e294bcacf7bf79c90fc7ffb46f34d3902aaec Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 Jul 2024 11:53:00 +0200 Subject: 🐛 fix many date and numeric searches (refs #5928) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/views_item.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'ishtar_common/views_item.py') diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 9e347a08d..fbe522b1c 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -2336,7 +2336,6 @@ def get_item( distinct_queries, query_parameters, ) - search_vector = "" if "search_vector" in dct: search_vector = dct.pop("search_vector") @@ -2366,6 +2365,20 @@ def get_item( if tmp_excluded: excluded_dct.update(tmp_excluded) + # dated_fields, number_fields + # ['signature_date', ...], ['signature_date__year', ...] + # -> remove 'signature_date' + filtered_dated_fields = [] + for field_name in my_dated_fields: + exc = False + for number_field in my_number_fields: + if number_field.startswith(field_name): + exc = True + break + if not exc: + filtered_dated_fields.append(field_name) + my_dated_fields = filtered_dated_fields + _manage_dated_fields(my_dated_fields, dct) _manage_dated_fields(my_dated_fields, excluded_dct) -- cgit v1.2.3