Removing foissil: subcave and flatpages-redirects

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)

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

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():