diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
| commit | c8dd8eba4546961fa154c0ae386709750fcfffb4 (patch) | |
| tree | 613ea46830ed40c5b9b031ba54664f05cfe98b75 /ishtar_common/views.py | |
| parent | c1e94dc1b8851b61bc8d697e08f8a407b5269365 (diff) | |
| parent | 219a775ed06ba6e75b2a9a04af406aea3ef579bb (diff) | |
| download | Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.tar.bz2 Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.zip | |
Merge branch 'master' into v0.9
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"], |