From 1a32a2430824034d22c848c9d37e1197eb90ff4e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 19 Jan 2018 17:59:04 +0100 Subject: Adapt context record forms --- ishtar_common/templates/base.html | 5 +++-- ishtar_common/views.py | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index ee318fa7c..fa62acdd2 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -54,11 +54,12 @@ {% include "navbar.html" %} {% if not reminders %} - {% else %}
{% trans "Current items" %} + {% else %} +
{% trans "Current items" %}
{% for lbl, value in reminders %}

{{lbl}}{% trans ":"%} {{value}}

{% endfor %} -
{%endif%} + {%endif%} diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 020544d19..b0365c1cf 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -608,6 +608,8 @@ def _get_values(request, val): DEFAULT_ROW_NUMBER = 10 +# length is used by ajax DataTable call and can be ambiguous for some models +EXCLUDED_FIELDS = ['length'] def get_item(model, func_name, default_name, extra_request_keys=[], @@ -702,6 +704,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[], request_keys.update(my_extra_request_keys) request_items = request.method == 'POST' and request.POST \ or request.GET + request_items = dict( + [(k, request_items[k]) + for k in request_items if k not in EXCLUDED_FIELDS]) dct = my_base_request if full == 'shortcut': dct['cached_label__icontains'] = request.GET.get('term', None) -- cgit v1.2.3