diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-07-09 11:53:00 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-07-09 11:53:00 +0200 |
| commit | 915e294bcacf7bf79c90fc7ffb46f34d3902aaec (patch) | |
| tree | 1e8aab73d44e23139571665e35cd722ed3afca28 /ishtar_common | |
| parent | d7effe6fae485d3b2d4bfbe1315bd3acf1d85e41 (diff) | |
| download | Ishtar-915e294bcacf7bf79c90fc7ffb46f34d3902aaec.tar.bz2 Ishtar-915e294bcacf7bf79c90fc7ffb46f34d3902aaec.zip | |
🐛 fix many date and numeric searches (refs #5928)
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models.py | 2 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index def056425..9eeea5d66 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4257,7 +4257,7 @@ class Document( ] BOOL_FIELDS = BaseHistorizedItem.BOOL_FIELDS + ["duplicate"] - + NUMBER_FIELDS = ["operations__year"] COL_LABELS = { "authors__cached_label": _("Authors"), "complete_identifier": _("Identifier"), 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) |