From b35a0b0d26303e61e20b320db9358ae425c49933 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Fri, 19 Jun 2020 16:39:05 +0100 Subject: Fully working dj 1.11.29 --- core/models_caves.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/models_caves.py') diff --git a/core/models_caves.py b/core/models_caves.py index a037c90..11aa24a 100644 --- a/core/models_caves.py +++ b/core/models_caves.py @@ -125,7 +125,7 @@ class Cave(TroggleModel): return urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,})) def __str__(self, sep = ": "): - return str("slug:"+str(self.slug())) + return str(self.slug()) def get_QMs(self): return QM.objects.filter(found_by__cave_slug=self.caveslug_set.all()) @@ -418,7 +418,7 @@ class LogbookEntry(TroggleModel): expeditionday = models.ForeignKey("ExpeditionDay", null=True,on_delete=models.CASCADE)#MJG wants to KILL THIS (redundant information) expedition = models.ForeignKey(Expedition,blank=True, null=True,on_delete=models.CASCADE) # yes this is double- title = models.CharField(max_length=settings.MAX_LOGBOOK_ENTRY_TITLE_LENGTH) - cave_slug = models.SlugField(max_length=50) + cave_slug = models.SlugField(max_length=50, blank=True, null=True) place = models.CharField(max_length=100,blank=True, null=True,help_text="Only use this if you haven't chosen a cave") text = models.TextField() slug = models.SlugField(max_length=50) -- cgit v1.2.3