diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models_caves.py | 19 | ||||
| -rw-r--r-- | core/models_survex.py | 4 |
2 files changed, 14 insertions, 9 deletions
diff --git a/core/models_caves.py b/core/models_caves.py index 0338a62..e20b17f 100644 --- a/core/models_caves.py +++ b/core/models_caves.py @@ -201,15 +201,16 @@ class Cave(TroggleModel): pass return lowestareas[0] -def getCaveByReference(reference): - areaname, code = reference.split("-", 1) - area = Area.objects.get(short_name = areaname) - foundCaves = list(Cave.objects.filter(area = area, kataster_number = code).all()) + list(Cave.objects.filter(area = area, unofficial_number = code).all()) - #print((list(foundCaves))) - if len(foundCaves) == 1: - return foundCaves[0] - else: - return False +# This seems to be peculiarly broken, and is now replaced for logbooks. +# def getCaveByReference(reference): + # areaname, code = reference.split("-", 1) + # area = Area.objects.get(short_name = areaname) + # foundCaves = list(Cave.objects.filter(area = area, kataster_number = code).all()) + list(Cave.objects.filter(area = area, unofficial_number = code).all()) + # #print((list(foundCaves))) + # if len(foundCaves) == 1: + # return foundCaves[0] + # else: + # return False class OtherCaveName(TroggleModel): name = models.CharField(max_length=160) diff --git a/core/models_survex.py b/core/models_survex.py index e46baae..4cbf611 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -16,6 +16,10 @@ class SurvexDirectory(models.Model): class Meta: ordering = ('id',) + def __str__(self): + return str(self.path) + "-" + str(self.primarysurvexfile.path) + + class SurvexFile(models.Model): path = models.CharField(max_length=200) |