diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 19:59:38 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 19:59:38 +0100 |
| commit | 34e2ab88b6a4e33784f1306bae3e27df1b355739 (patch) | |
| tree | c7946c091644647edbb3a4eb27ca5a5bc9def18e /ishtar_common/views.py | |
| parent | 1d7b5ef3055236b56ec1e104ab66a6ccc8e3da14 (diff) | |
| parent | d006f284d408ccc00ba5f93ddd845ef2950f0ea3 (diff) | |
| download | Ishtar-34e2ab88b6a4e33784f1306bae3e27df1b355739.tar.bz2 Ishtar-34e2ab88b6a4e33784f1306bae3e27df1b355739.zip | |
Merge branch 'master' into v0.9
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, |