diff options
Diffstat (limited to 'core/models_caves.py')
| -rw-r--r-- | core/models_caves.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/models_caves.py b/core/models_caves.py index b872489..17b372a 100644 --- a/core/models_caves.py +++ b/core/models_caves.py @@ -202,11 +202,11 @@ class Cave(TroggleModel): pass return lowestareas[0] -class OtherCaveName(TroggleModel): - name = models.CharField(max_length=160) - cave = models.ForeignKey(Cave,on_delete=models.CASCADE) - def __str__(self): - return str(self.name) +# class OtherCaveName(TroggleModel): + # name = models.CharField(max_length=160) + # cave = models.ForeignKey(Cave,on_delete=models.CASCADE) + # def __str__(self): + # return str(self.name) class EntranceSlug(models.Model): entrance = models.ForeignKey('Entrance',on_delete=models.CASCADE) @@ -503,7 +503,10 @@ class QM(TroggleModel): return "%s %s" % (self.code(), self.grade) def code(self): - return "%s-%s-%s" % (str(self.found_by.cave)[6:], self.found_by.date.year, self.number) + if self.found_by: + return "%s-%s-%s" % (str(self.found_by.cave)[6:], self.found_by.date.year, self.number) + else: + return "%s" % (self.number) def get_absolute_url(self): #return settings.URL_ROOT + '/cave/' + self.found_by.cave.kataster_number + '/' + str(self.found_by.date.year) + '-' + '%02d' %self.number |