fixes

[wolnelektury.git] / src / waiter / views.py

diff --git a/src/waiter/views.py b/src/waiter/views.py
index b951cc4..120e32e 100644 (file)
--- a/src/waiter/views.py
+++ b/src/waiter/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -8,17 +7,22 @@ from waiter.settings import WAITER_URL
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse
 from django.views.decorators.cache import never_cache
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse
 from django.views.decorators.cache import never_cache

+from wolnelektury.utils import is_ajax

 
 
 @never_cache
 def wait(request, path):
     if WaitedFile.exists(path):
         file_url = join(WAITER_URL, path)
 
 
 @never_cache
 def wait(request, path):
     if WaitedFile.exists(path):
         file_url = join(WAITER_URL, path)

+        waiting = None

     else:
     else:

-        file_url = ""
+        file_url = None

         waiting = get_object_or_404(WaitedFile, path=path)
 
         waiting = get_object_or_404(WaitedFile, path=path)
 

-    if request.is_ajax():
+    if is_ajax(request):

         return HttpResponse(file_url)
     else:
         return HttpResponse(file_url)
     else:

-        return render(request, "waiter/wait.html", locals())
+        return render(request, "waiter/wait.html", {
+            'waiting': waiting,
+            'file_url': file_url,
+        })