summaryrefslogtreecommitdiffstats
path: root/flatpages
diff options
context:
space:
mode:
Diffstat (limited to 'flatpages')
-rw-r--r--flatpages/admin.py6
-rw-r--r--flatpages/models.py16
-rw-r--r--flatpages/views.py24
3 files changed, 23 insertions, 23 deletions
diff --git a/flatpages/admin.py b/flatpages/admin.py
index 2bb1f84..ddb9ab2 100644
--- a/flatpages/admin.py
+++ b/flatpages/admin.py
@@ -1,5 +1,5 @@
-from troggle.flatpages.models import Redirect, EntranceRedirect
+#from troggle.flatpages.models import Redirect, EntranceRedirect
from django.contrib import admin
-admin.site.register(Redirect)
-admin.site.register(EntranceRedirect)
+# admin.site.register(Redirect)
+# admin.site.register(EntranceRedirect)
diff --git a/flatpages/models.py b/flatpages/models.py
index 7808f09..08d769a 100644
--- a/flatpages/models.py
+++ b/flatpages/models.py
@@ -1,12 +1,12 @@
from django.db import models
from troggle.core.models_caves import Cave, Entrance
-class Redirect(models.Model):
- originalURL = models.CharField(max_length=200, unique=True)
- newURL = models.CharField(max_length=200)
+# class Redirect(models.Model):
+ # originalURL = models.CharField(max_length=200, unique=True)
+ # newURL = models.CharField(max_length=200)
-class EntranceRedirect(models.Model):
- originalURL = models.CharField(max_length=200)
- entrance = models.ForeignKey(Entrance,on_delete=models.CASCADE)
- def __str__(self):
- return self.entrance.slug
+# class EntranceRedirect(models.Model):
+ # originalURL = models.CharField(max_length=200)
+ # entrance = models.ForeignKey(Entrance,on_delete=models.CASCADE)
+ # def __str__(self):
+ # return self.entrance.slug
diff --git a/flatpages/views.py b/flatpages/views.py
index 32ab802..8194b37 100644
--- a/flatpages/views.py
+++ b/flatpages/views.py
@@ -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():