xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Removing foissil: subcave and flatpages-redirects

Browse Source
This commit is contained in:
Philip Sargent
2020-07-22 22:14:35 +01:00
parent 190514597b
commit 427afa9ebd
8 changed files with 85 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flatpages/views.py
View File

@@ -8,19 +8,19 @@ from django.template import Context, loader
import django.forms as forms
from troggle.helper import login_required_if_public
from troggle.flatpages.models import Redirect, EntranceRedirect
#from troggle.flatpages.models import Redirect, EntranceRedirect
from troggle.core.models_caves import Cave
import troggle.core.views_caves
import troggle.settings as settings
def flatpage(request, path):
#print(" - FLATPAGES delivering the file: {} as MIME type: {}".format(path,getmimetype(path)))
try:
r = Redirect.objects.get(originalURL = path)
#print(" - FLATPAGES REDIRECT the file: {} as: {}".format(path,r))
return HttpResponseRedirect(r.newURL) # Redirect after POST
except Redirect.DoesNotExist:
pass
# try:
# r = Redirect.objects.get(originalURL = path)
# #print(" - FLATPAGES REDIRECT the file: {} as: {}".format(path,r))
# return HttpResponseRedirect(r.newURL) # Redirect after POST
# except Redirect.DoesNotExist:
# pass
try:
r = Cave.objects.get(url = path)
@@ -36,11 +36,11 @@ def flatpage(request, path):
return troggle.core.views_caves.caveSlug(request, c.slug())
pass
try:
r = EntranceRedirect.objects.get(originalURL = path)
return troggle.core.views_caves.entranceSlug(request, r.entrance.slug())
except EntranceRedirect.DoesNotExist:
pass
# try:
# r = EntranceRedirect.objects.get(originalURL = path)
# return troggle.core.views_caves.entranceSlug(request, r.entrance.slug())
# except EntranceRedirect.DoesNotExist:
# pass
if path.startswith("noinfo") and settings.PUBLIC_SITE and not request.user.is_authenticated():