Fix up for django 1.10

[sommitrealweird.git] / sommitrealweird / bpcms / views.py

diff --git a/sommitrealweird/bpcms/views.py b/sommitrealweird/bpcms/views.py
index d98fa8cf5e1ec2cc6c6ed5846bd1a2aa7ae7dc2c..0396bf8501325392fdabb4cb6638c0163edcec36 100644 (file)
--- a/sommitrealweird/bpcms/views.py
+++ b/sommitrealweird/bpcms/views.py
@@ -1,5 +1,6 @@
-from bpcms.models import Document, Folder
-from django.http import Http404, HttpResponse
+from bpcms.models import CSSDocument, Document, Folder
+from django.http import Http404
+from django.shortcuts import render

 from django.template import RequestContext, loader
 
 def document_view(request, slug=None, folders=None):
 from django.template import RequestContext, loader
 
 def document_view(request, slug=None, folders=None):


@@ -27,27 +28,47 @@ def document_view(request, slug=None, folders=None):
 
     if folder != None:
         try:
 
     if folder != None:
         try:

-            doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__exact=folder)
+            if not request.user.is_authenticated():
+                doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__exact=folder)
+            else:
+
+                doc = Document.objects.get(slug__exact=slug, folder__exact=folder)

         except:
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__exact=folder)
         except:
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__exact=folder)

-                doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder)
+                if not request.user.is_authenticated():
+                    doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder)
+                else:
+                    doc = Document.objects.get(slug__exact='index', folder__exact=folder)

             except:
                 raise Http404
     else:
         try:
             except:
                 raise Http404
     else:
         try:

-            doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__isnull=True)
+            if not request.user.is_authenticated():
+                doc = Document.objects.get(slug__exact=slug, islive__exact=True, folder__isnull=True)
+            else:
+                doc = Document.objects.get(slug__exact=slug, folder__isnull=True)

         except:
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__isnull=True)
         except:
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__isnull=True)

-                doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder)
+                if not request.user.is_authenticated():
+                    doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder)
+                else:
+                    doc = Document.objects.get(slug__exact='index', folder__exact=folder)

             except:
                 raise Http404
     template_name = "bpcms/%s.html" %(doc.format,)
             except:
                 raise Http404
     template_name = "bpcms/%s.html" %(doc.format,)

-    t = loader.get_template(template_name)
-    c = RequestContext(request,
-        {
+    c = {

             "content"   : doc.content,
             "title"     : doc.title,
             "content"   : doc.content,
             "title"     : doc.title,

-        })
-    return HttpResponse(t.render(c))
+            "extracss"  : doc.extracss.all(),
+        }
+    return render(request, template_name, c)
+
+def css_view(request, slug):
+    cssdoc = CSSDocument.objects.get(slug=slug)
+    if not cssdoc:
+        raise Http404()
+
+    return HttpResponse(cssdoc.content, content_type="text/css")
+