summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2014-01-07 15:00:19 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2014-01-07 15:03:25 +0100
commit8af1bb8192dae10b71843cc096ce1eccdb90c1a9 (patch)
tree373eaad0de23406db69d6f6a1fb311a21cbe9591 /ishtar_common
parent6169f3eef6ce8ba45607751f0c60c8676933c52b (diff)
downloadIshtar-8af1bb8192dae10b71843cc096ce1eccdb90c1a9.tar.bz2
Ishtar-8af1bb8192dae10b71843cc096ce1eccdb90c1a9.zip
Administrativ Act: manage default filtering (refs #1597)
* add indirect filtering possibility to get_item
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/views.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 961ff680c..3e0bffd32 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -188,7 +188,7 @@ HIERARCHIC_FIELDS = ['periods', 'period', 'unit', 'material_type',
PRIVATE_FIELDS = ('id', 'history_modifier', 'order')
def get_item(model, func_name, default_name, extra_request_keys=[],
base_request={}, bool_fields=[], reversed_bool_fields=[],
- dated_fields=[], associated_models=[]):
+ dated_fields=[], associated_models=[], relative_session_names={}):
"""
Generic treatment of tables
"""
@@ -226,6 +226,12 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
if default_name in request.session and \
request.session[default_name]:
dct = {"pk":request.session[default_name]}
+ else:
+ for name in relative_session_names.keys():
+ if name in request.session and request.session[name]:
+ k = relative_session_names[name]
+ dct = {k:request.session[name]}
+ break
if (not dct or data_type == 'csv') and func_name in request.session:
dct = request.session[func_name]
else: