From: Brett Parker Date: Thu, 23 Jul 2009 12:40:21 +0000 (+0100) Subject: make it so that registered/logged in users can see the non-live pages X-Git-Url: https://git.sommitrealweird.co.uk/sommitrealweird.git/commitdiff_plain/df318ffde3168c6166a2ef133624b78c4b67aca0?ds=inline make it so that registered/logged in users can see the non-live pages --- diff --git a/sommitrealweird/bpcms/views.py b/sommitrealweird/bpcms/views.py index d98fa8c..bde19cc 100644 --- a/sommitrealweird/bpcms/views.py +++ b/sommitrealweird/bpcms/views.py @@ -27,20 +27,33 @@ def document_view(request, slug=None, folders=None): 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) - doc = Document.objects.get(slug__exact='index', islive__exact=True, folder__exact=folder) + if not request.user.isauthenticated(): + 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: - 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) - 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,)