diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-08 02:34:24 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-08 02:34:24 +0100 |
| commit | bb482fb0d9e54498785f1a16a984d92de6c8ea86 (patch) | |
| tree | 57dee09f66247af329e2aab0cea62b4b26165025 /ishtar_common/views.py | |
| parent | 969eda7b6d5d8eafffab1279a223f9172f403837 (diff) | |
| parent | 89c66a92b539ab4cc682cf8c774dc65db6c3ba39 (diff) | |
| download | Ishtar-bb482fb0d9e54498785f1a16a984d92de6c8ea86.tar.bz2 Ishtar-bb482fb0d9e54498785f1a16a984d92de6c8ea86.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 981522d0d..6f95e070a 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -398,11 +398,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[], q = Q(**{req_key: val}) reqs = reqs | q and_reqs.append(reqs) - if not dct and 'submited' not in request_items: + if 'submited' not in request_items: if default_name in request.session and \ request.session[default_name]: dct = {"pk": request.session[default_name]} - else: + elif not dct: for name in relative_session_names.keys(): if name in request.session and request.session[name]: k = relative_session_names[name] |