diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-04-06 18:44:29 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-04-06 18:44:29 +0200 |
| commit | 6283ac8a40ccfd40738e39f5d856b5dcf69e9d5e (patch) | |
| tree | 18ed41943de192e0996c7177c703d3c096866798 | |
| parent | 4f7f666a02de6612e04e5c5026d6b3724750d7dd (diff) | |
| download | Ishtar-6283ac8a40ccfd40738e39f5d856b5dcf69e9d5e.tar.bz2 Ishtar-6283ac8a40ccfd40738e39f5d856b5dcf69e9d5e.zip | |
Correct default data management for get_item (closes #345)
| -rw-r--r-- | ishtar/furnitures/views.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py index c3b7f6f4e..024cd8615 100644 --- a/ishtar/furnitures/views.py +++ b/ishtar/furnitures/views.py @@ -181,9 +181,10 @@ def get_item(model, func_name, default_name, extra_request_keys=[], continue dct[request_keys[k]] = q if not dct and 'submited' not in request.GET: - if default_name in request.session: + if default_name in request.session and \ + request.session[default_name]: dct = {"pk":request.session[default_name]} - elif func_name in request.session: + if (not dct or data_type == 'csv') and func_name in request.session: dct = request.session[func_name] else: request.session[func_name] = dct |