diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:48:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-21 22:48:35 +0200 |
| commit | 3870d41f4be7474d85a9bb876e3c198eb9be2188 (patch) | |
| tree | e23e8adad9ce5ff3df04e103aa9903d4c73593b6 /ishtar_common/views.py | |
| parent | ca73887cb5cc58c56c4bc45482067b4f5cdf0187 (diff) | |
| parent | 6b60df0388d0ba2221e04e2f4622f8544ef599f9 (diff) | |
| download | Ishtar-3870d41f4be7474d85a9bb876e3c198eb9be2188.tar.bz2 Ishtar-3870d41f4be7474d85a9bb876e3c198eb9be2188.zip | |
Merge branch 'v1.0' into wheezy
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] \ |