Commented-out unused CaveDescription object

core/TESTS/tests.py

@@ -51,7 +51,7 @@ class SimpleTest(SimpleTestCase):
         from django.http import HttpResponse, HttpResponseRedirect
         from django.shortcuts import get_object_or_404, render
         from troggle.core.models import Expedition
-        from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, CaveDescription, EntranceSlug, Entrance, Area, SurvexStation
+        from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation
         from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm
         from troggle.helper import login_required_if_public
         from django.contrib.auth.decorators import login_required

core/admin.py

@@ -6,7 +6,7 @@ from django.core import serializers
 
 from troggle.core.views_other import downloadLogbook
 from troggle.core.models import Person, PersonExpedition, Expedition, DataIssue
-from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, OtherCaveName, CaveDescription, LogbookEntry, PersonTrip, QM
+from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, OtherCaveName, LogbookEntry, PersonTrip, QM
 from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan
 
 
@@ -110,7 +110,7 @@ admin.site.register(Cave, CaveAdmin)
 admin.site.register(Area)
 admin.site.register(CaveAndEntrance)
 #admin.site.register(NewSubCave)
-admin.site.register(CaveDescription)
+#admin.site.register(CaveDescription)
 admin.site.register(Entrance, EntranceAdmin)
 admin.site.register(SurvexBlock, SurvexBlockAdmin)
 admin.site.register(Expedition)

core/models_caves.py

@@ -361,34 +361,34 @@ class Entrance(TroggleModel):
         f.write(u8)
         f.close()
 
-class CaveDescription(TroggleModel):
-    short_name = models.CharField(max_length=50, unique = True)
-    long_name = models.CharField(max_length=200, blank=True, null=True)
-    description = models.TextField(blank=True,null=True)
-    #linked_subcaves = models.ManyToManyField("NewSubCave", blank=True)
-    linked_entrances = models.ManyToManyField("Entrance", blank=True)
-    linked_qms = models.ManyToManyField("QM", blank=True)
+# class CaveDescription(TroggleModel):
+    # short_name = models.CharField(max_length=50, unique = True)
+    # long_name = models.CharField(max_length=200, blank=True, null=True)
+    # description = models.TextField(blank=True,null=True)
+    # #linked_subcaves = models.ManyToManyField("NewSubCave", blank=True)
+    # linked_entrances = models.ManyToManyField("Entrance", blank=True)
+    # linked_qms = models.ManyToManyField("QM", blank=True)
 
-    def __str__(self):
-        if self.long_name:
-            return str(self.long_name)
-        else:
-            return str(self.short_name)
+    # def __str__(self):
+        # if self.long_name:
+            # return str(self.long_name)
+        # else:
+            # return str(self.short_name)
     
-    def get_absolute_url(self):
-        return urljoin(settings.URL_ROOT, reverse('cavedescription', args=(self.short_name,)))
+    # def get_absolute_url(self):
+        # return urljoin(settings.URL_ROOT, reverse('cavedescription', args=(self.short_name,)))
     
-    def save(self):
-        """
-        Overridden save method which stores wikilinks in text as links in database.
-        """      
-        TroggleModel.save()
-        #super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
-        qm_list=get_related_by_wikilinks(self.description)
-        for qm in qm_list:
-            self.linked_qms.add(qm)
-        TroggleModel.save() 
-        #super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
+    # def save(self):
+        # """
+        # Overridden save method which stores wikilinks in text as links in database.
+        # """      
+        # TroggleModel.save()
+        # #super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
+        # qm_list=get_related_by_wikilinks(self.description)
+        # for qm in qm_list:
+            # self.linked_qms.add(qm)
+        # TroggleModel.save() 
+        # #super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
 
 # class NewSubCave(TroggleModel):
     # name = models.CharField(max_length=200, unique = True)

core/views_caves.py

@@ -15,7 +15,7 @@ from django.shortcuts import get_object_or_404, render
 import troggle.settings as settings
 import troggle.core.models as models
 from troggle.core.models import Expedition
-from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, CaveDescription, EntranceSlug, Entrance, Area, SurvexStation
+from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation
 from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm
 from troggle.helper import login_required_if_public
 
@@ -291,9 +291,9 @@ def surveyindex(request):
     expeditions=Expedition.objects.order_by("-year")
     return render(request,'survey.html',locals())
 
-def cave_description(request, cavedescription_name):
-    cave_description = get_object_or_404(CaveDescription, short_name = cavedescription_name)
-    return render(request,'cave_description.html', locals())
+# def cave_description(request, cavedescription_name):
+    # cave_description = get_object_or_404(CaveDescription, short_name = cavedescription_name)
+    # return render(request,'cave_description.html', locals())
 
 def get_entrances(request, caveslug):
     cave = Cave.objects.get(caveslug__slug = caveslug)