diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-03 16:52:09 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-03 16:52:09 +0100 |
| commit | b60a1e62355695783e25b0f8054aaab7d40b73e0 (patch) | |
| tree | 13d9dca2d51e2092c8bb079cb798b3bae4171867 /ishtar_common/views.py | |
| parent | d780b41a41127fb391ce7ad059b4aa55d632e185 (diff) | |
| parent | 06034b6c15b3ae6cc61003520eb564091c42d8f0 (diff) | |
| download | Ishtar-b60a1e62355695783e25b0f8054aaab7d40b73e0.tar.bz2 Ishtar-b60a1e62355695783e25b0f8054aaab7d40b73e0.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 33f4fac7f..467401b8f 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -691,7 +691,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], reqs = Q(**{req_keys[0]: val}) for req_key in req_keys[1:]: q = Q(**{req_key: val}) - reqs = reqs | q + reqs |= q and_reqs.append(reqs) if 'submited' not in request_items and full != 'shortcut': # default search @@ -707,7 +707,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], elif dct == (base_request or {}): # a parent item may be selected in the default menu for name, key in my_relative_session_names: - if name in request.session and request.session[name]: + if name in request.session and request.session[name] \ + and 'basket-' not in request.session[name]: dct.update({key: request.session[name]}) break if (not dct or data_type == 'csv') \ |