diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:41:41 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:41:41 +0100 |
| commit | c69950717a77550214fd696eb4822e4f8a67ee04 (patch) | |
| tree | 9597b56f1072f81e12bbae142211c030f740b90e /ishtar_common/views.py | |
| parent | 539a6e115a438ef059fec17afa655c4892e7ef60 (diff) | |
| parent | d780b41a41127fb391ce7ad059b4aa55d632e185 (diff) | |
| download | Ishtar-c69950717a77550214fd696eb4822e4f8a67ee04.tar.bz2 Ishtar-c69950717a77550214fd696eb4822e4f8a67ee04.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index e8ae1a458..33f4fac7f 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -368,14 +368,14 @@ def update_current_item(request, item_type=None, pk=None): request.session["operation"] = '' currents['operation'] = None if item_type in ('operation', 'file') and currents['contextrecord'] and \ - (not request.session["operation"] or + (not request.session.get("operation", None) or currents['contextrecord'].operation != currents['operation']): request.session["contextrecord"] = '' currents['contextrecord'] = None from archaeological_finds.models import Find if item_type in ('contextrecord', 'operation', 'file') and \ currents['find'] and \ - (not request.session["contextrecord"] or + (not request.session.get("contextrecord", None) or not Find.objects.filter( downstream_treatment__isnull=True, base_finds__context_record__pk=request.session["contextrecord"], |