projects
/
sommitrealweird.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make it so that registered/logged in users can see the non-live pages
[sommitrealweird.git]
/
sommitrealweird
/
bpcms
/
views.py
diff --git
a/sommitrealweird/bpcms/views.py
b/sommitrealweird/bpcms/views.py
index d98fa8cf5e1ec2cc6c6ed5846bd1a2aa7ae7dc2c..bde19cc3498e541c6e1ed75a0ca6aea9d5bdb931 100644
(file)
--- 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:
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.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:
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,)