diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-03-01 15:52:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-03-01 15:55:00 +0100 |
| commit | bf2793a2b8532cfa73cae9a4528e6d57efe4baac (patch) | |
| tree | 8a0341b69409935818841ca8068883a17e6aa8ae | |
| parent | 81e41278d8b0ce914c149051f79b455080707ac0 (diff) | |
| download | Ishtar-bf2793a2b8532cfa73cae9a4528e6d57efe4baac.tar.bz2 Ishtar-bf2793a2b8532cfa73cae9a4528e6d57efe4baac.zip | |
Tables: pinned search do not overload click on shortcuts
| -rw-r--r-- | CHANGES.md | 9 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/DataTables.html | 2 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index 98ef179e1..98e351fa2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,14 @@ Ishtar changelog ================ -v3.1.0 - 2021-02-28 +v3.1.2 - 2021-03-01 +-------------------- + +### Bug fixes ### +- tables: pinned search do not overload click on shortcuts + + +v3.1.1 - 2021-02-28 -------------------- ### Features ### diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index 54ae5a630..f116d9573 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -147,7 +147,7 @@ jQuery(document).ready(function(){ "ajax": { "url": base_source, "dataSrc": function (json) { - manage_pinned_search("{{name}}", json); + if (!default_search_vector) manage_pinned_search("{{name}}", json); update_submit_args(); setTimeout( // 50ms is waited on load so... function(){ diff --git a/ishtar_common/version.py b/ishtar_common/version.py index 94731213a..fb048d814 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 3.1.1 -VERSION = (3, 1, 1) +# 3.1.2 +VERSION = (3, 1, 2) def get_version(): diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index f5c5f3b06..c562a5634 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -1640,8 +1640,8 @@ def get_item(model, func_name, default_name, extra_request_keys=None, and_reqs.append(reqs) pinned_search = "" - # manage default and pinned search - if 'submited' not in request_items and full != 'shortcut': + # manage default and pinned search and not bookmark + if 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: |