diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-19 17:59:04 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-19 17:59:04 +0100 |
| commit | 1a32a2430824034d22c848c9d37e1197eb90ff4e (patch) | |
| tree | e8a1dd8ba41805eee55711d5e09d0c3ac3139815 /ishtar_common | |
| parent | c3be1a11bb22ca404e3c82daac4bdfc279dc321c (diff) | |
| download | Ishtar-1a32a2430824034d22c848c9d37e1197eb90ff4e.tar.bz2 Ishtar-1a32a2430824034d22c848c9d37e1197eb90ff4e.zip | |
Adapt context record forms
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/base.html | 5 | ||||
| -rw-r--r-- | ishtar_common/views.py | 5 |
2 files changed, 8 insertions, 2 deletions
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 @@ <body{% if current_theme%} id='{{current_theme}}'{%endif%}> {% include "navbar.html" %} {% if not reminders %}<div id="context-menu" class="navbar navbar-expand-lg"></div> - {% else %}<fieldset id='reminder'><legend>{% trans "Current items" %}</legend> + {% else %} +<div id="reminder"><h5>{% trans "Current items" %}</h5> {% for lbl, value in reminders %} <p><strong class='lbl'>{{lbl}}{% trans ":"%}</strong> <span class='value'>{{value}}</span></p> {% endfor %} -</fieldset>{%endif%} +</div> {%endif%} <button class="nav-button btn btn-sm btn-secondary" id="to_bottom_arrow"> <i class="fa fa-arrow-down" aria-hidden="true"></i> </button> 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) |