diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-03-09 11:35:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-03-09 11:35:28 +0100 |
| commit | 56f2cf7a00fcac8ca84192ec94fe9bdce1cb1d14 (patch) | |
| tree | 9b4fb8ba9c7161354fc0f7e07e9e56e3eba95571 | |
| parent | 2a9c429e237b898547bf48d44574196365561867 (diff) | |
| download | Ishtar-56f2cf7a00fcac8ca84192ec94fe9bdce1cb1d14.tar.bz2 Ishtar-56f2cf7a00fcac8ca84192ec94fe9bdce1cb1d14.zip | |
Fix: pined search do not interfere with sheet views
| -rw-r--r-- | ishtar_common/views_item.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 621b56136..e0861c7b8 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -670,7 +670,8 @@ def _parse_parentheses_groups(groups, query_parameters, current_dct=None, def _search_manage_search_vector(model, dct, exc_dct, distinct_queries, query_parameters): - if 'search_vector' not in dct: + if 'search_vector' not in dct \ + or not model._meta.managed: # is a view - no search_vector return dct, exc_dct, distinct_queries search_vector = dct['search_vector'] @@ -1640,8 +1641,12 @@ def get_item(model, func_name, default_name, extra_request_keys=None, and_reqs.append(reqs) pinned_search = "" + has_a_search = any( + k for k in dct.values() + if k not in ('extras', 'and_reqs', 'exc_and_reqs')) # manage default and pinned search and not bookmark - if not request_items.get("search_vector", "") and full != 'shortcut': + if not has_a_search and not request_items.get("search_vector", "") \ + and full != 'shortcut': if data_type == 'csv' and func_name in request.session: dct = request.session[func_name] else: |