diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 20:09:06 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 20:09:06 +0100 |
| commit | d26217d09080ef93fe0b36c3543a266d7a04c688 (patch) | |
| tree | 99faaf3ec3a2d6da7d265995419dc6af45a69fbe /ishtar_common/views.py | |
| parent | 4abb5ff78620c096ab4238535c8e4b22291a2cb1 (diff) | |
| parent | ac595e9aa13d27fb15e70eb1f6e2d11f928a4c4a (diff) | |
| download | Ishtar-d26217d09080ef93fe0b36c3543a266d7a04c688.tar.bz2 Ishtar-d26217d09080ef93fe0b36c3543a266d7a04c688.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index c4525b18b..42ebdf277 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -79,6 +79,10 @@ ENCODING = settings.ENCODING or 'utf-8' logger = logging.getLogger(__name__) +def status(request): + return HttpResponse('OK') + + def index(request): """ Main page @@ -365,7 +369,8 @@ def update_current_item(request, item_type=None, pk=None): request.session["contextrecord"] = '' currents['contextrecord'] = None from archaeological_finds.models import Find - if item_type in ('contextrecord', 'operation', 'file') and currents['find'] and\ + if item_type in ('contextrecord', 'operation', 'file') and \ + currents['find'] and \ (not request.session["contextrecord"] or not Find.objects.filter( downstream_treatment__isnull=True, |