From c4f82e33528eb11238932f768e2f8df5a548e6e1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 6 Apr 2011 18:44:29 +0200 Subject: Correct default data management for get_item (closes #345) --- ishtar/furnitures/views.py | 5 +++-- 1 file 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 -- cgit v1.2.3