diff --git a/core/admin.py b/core/admin.py index 1e2bbe6..e0ba235 100644 --- a/core/admin.py +++ b/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, NewSubCave, OtherCaveName, CaveDescription, LogbookEntry, PersonTrip, QM +from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, OtherCaveName, CaveDescription, LogbookEntry, PersonTrip, QM from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan @@ -109,7 +109,7 @@ class EntranceAdmin(TroggleModelAdmin): admin.site.register(Cave, CaveAdmin) admin.site.register(Area) admin.site.register(CaveAndEntrance) -admin.site.register(NewSubCave) +#admin.site.register(NewSubCave) admin.site.register(CaveDescription) admin.site.register(Entrance, EntranceAdmin) admin.site.register(SurvexBlock, SurvexBlockAdmin) diff --git a/core/models_caves.py b/core/models_caves.py index 1f11c09..cf388d9 100644 --- a/core/models_caves.py +++ b/core/models_caves.py @@ -365,7 +365,7 @@ 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_subcaves = models.ManyToManyField("NewSubCave", blank=True) linked_entrances = models.ManyToManyField("Entrance", blank=True) linked_qms = models.ManyToManyField("QM", blank=True) @@ -390,10 +390,10 @@ class CaveDescription(TroggleModel): 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) - def __str__(self): - return str(self.name) +# class NewSubCave(TroggleModel): + # name = models.CharField(max_length=200, unique = True) + # def __str__(self): + # return str(self.name) class LogbookEntry(TroggleModel): """Single parsed entry from Logbook