Merge branch 'master' of /home/brettp/sommitrealweird

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

diff --git a/sommitrealweird/bpcms/views.py b/sommitrealweird/bpcms/views.py
index bde19cc3498e541c6e1ed75a0ca6aea9d5bdb931..9cb3e42e031b7ce7162df2a05a81bbc139dd2c68 100644 (file)
--- a/sommitrealweird/bpcms/views.py
+++ b/sommitrealweird/bpcms/views.py
@@ -1,4 +1,4 @@
-from bpcms.models import Document, Folder
+from bpcms.models import CSSDocument, Document, Folder

 from django.http import Http404, HttpResponse
 from django.template import RequestContext, loader
 
 from django.http import Http404, HttpResponse
 from django.template import RequestContext, loader
 


@@ -35,7 +35,7 @@ def document_view(request, slug=None, folders=None):
         except:
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__exact=folder)
         except:
             try:
                 folder = Folder.objects.get(slug__exact=slug, parent__exact=folder)

-                if not request.user.isauthenticated():
+                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)
                     doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder)
                 else:
                     doc = Document.objects.get(slug__exact='index', folder__exact=folder)


@@ -62,5 +62,14 @@ def document_view(request, slug=None, folders=None):
         {
             "content"   : doc.content,
             "title"     : doc.title,
         {
             "content"   : doc.content,
             "title"     : doc.title,

+            "extracss"  : doc.extracss.all(),

         })
     return HttpResponse(t.render(c))
         })
     return HttpResponse(t.render(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")
+