summaryrefslogtreecommitdiffstats
path: root/core/models_caves.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-06-19 16:39:05 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-06-19 16:39:05 +0100
commitb35a0b0d26303e61e20b320db9358ae425c49933 (patch)
treeb241e1ea5747ed44aeef106b35b36a2685326e42 /core/models_caves.py
parent2c469718f60a11c0038ec15fb186eac275509b8b (diff)
downloadtroggle-b35a0b0d26303e61e20b320db9358ae425c49933.tar.gz
troggle-b35a0b0d26303e61e20b320db9358ae425c49933.tar.bz2
troggle-b35a0b0d26303e61e20b320db9358ae425c49933.zip
Fully working dj 1.11.29
Diffstat (limited to 'core/models_caves.py')
-rw-r--r--core/models_caves.py4
1 files changed, 2 insertions, 2 deletions
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)