fixing cyclic import problem

2 files changed, 8 insertions, 5 deletions

diff --git a/core/models/caves.py b/core/models/caves.py
index af215a7..b99140b 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -74,10 +74,7 @@ class CaveAndEntrance(models.Model):
     def __str__(self):
         return str(self.cave) + str(self.entrance_letter)
 
-class CaveSlug(models.Model):
-    cave = models.ForeignKey('Cave',on_delete=models.CASCADE)
-    slug = models.SlugField(max_length=50, unique = True)
-    primary = models.BooleanField(default=False)
+
 
 class Cave(TroggleModel):
     # too much here perhaps, 
@@ -164,6 +161,7 @@ class Cave(TroggleModel):
     def get_QMs(self):
         '''Searches for all QMs that reference this cave. 
         '''
+        #qms = self.qm_set.all().order_by('expoyear', 'block__date')
         qms = QM.objects.filter(cave=self).order_by('expoyear', 'block__date') # a QuerySet, see https://docs.djangoproject.com/en/4.0/ref/models/querysets/#order-by
         return qms # a QuerySet
 
diff --git a/core/models/logbooks.py b/core/models/logbooks.py
index b7aa5e3..9903db5 100644
--- a/core/models/logbooks.py
+++ b/core/models/logbooks.py
@@ -21,7 +21,7 @@ from django.template import Context, loader
 from django.urls import reverse
 
 import settings
-#from troggle.core.models.caves import CaveSlug
+#from troggle.core.models.qm import CaveSlug
 from troggle.core.models.survex import SurvexStation
 from troggle.core.models.troggle import (DataIssue, Expedition, Person,
                                          PersonExpedition, TroggleModel)
@@ -113,6 +113,11 @@ class PersonTrip(TroggleModel):
     def __str__(self):
         return f'{self.personexpedition} ({self.logbook_entry.date})'
 
+class CaveSlug(models.Model):
+    cave = models.ForeignKey('Cave',on_delete=models.CASCADE)
+    slug = models.SlugField(max_length=50, unique = True)
+    primary = models.BooleanField(default=False)
+    
 class QM(TroggleModel):
     """This is based on qm.csv in trunk/expoweb/1623/204 which has the fields:
     "Number","Grade","Area","Description","Page reference","Nearest station","Completion description","Comment"