diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:37:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:37:51 +0200 |
| commit | f8a59f8ee688220661890bb71733476eaa7f8a53 (patch) | |
| tree | 0254b160ab0b9f0987c0fa0cf07380f76d43b48c /ishtar_common/views.py | |
| parent | a854fb0090f0deb674e83011c45a2e6c4ff0caee (diff) | |
| parent | 2e76aa8d77164a80f28edf4cfe8fee2c1e267c86 (diff) | |
| download | Ishtar-f8a59f8ee688220661890bb71733476eaa7f8a53.tar.bz2 Ishtar-f8a59f8ee688220661890bb71733476eaa7f8a53.zip | |
Merge branch 'master' into v1.0v1.0
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 86c87d049..234dcd826 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -734,7 +734,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], model.objects.get(pk=dct["pk"])) except model.DoesNotExist: pass - elif dct == (base_request or {}): + elif dct == (my_base_request or {}): # a parent item may be selected in the default menu for name, key in my_relative_session_names: if name in request.session and request.session[name] \ |