diff options
Diffstat (limited to 'core/models/caves.py')
| -rw-r--r-- | core/models/caves.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index fb62a26..5f68e77 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -347,11 +347,13 @@ class Entrance(TroggleModel): return self.findability != "S" or not self.has_photo or self.marking != "T" def get_absolute_url(self): - ancestor_titles='/'.join([subcave.title for subcave in self.get_ancestors()]) - if ancestor_titles: - res = '/'.join((self.get_root().cave.get_absolute_url(), ancestor_titles, self.title)) - else: - res = '/'.join((self.get_root().cave.get_absolute_url(), self.title)) + # ancestor_titles='/'.join([subcave.title for subcave in self.get_ancestors()]) + # if ancestor_titles: + # res = '/'.join((self.get_root().cave.get_absolute_url(), ancestor_titles, self.title)) + # else: + # res = '/'.join((self.get_root().cave.get_absolute_url(), self.title)) + # return res + res = '/'.join((self.get_root().cave.get_absolute_url(), self.title)) return res def slug(self): @@ -367,6 +369,15 @@ class Entrance(TroggleModel): self.save() return self.cached_primary_slug + def cavelist(self): + rs = [] + res = "" + for e in CaveAndEntrance.objects.filter(entrance=self): + if e.cave: + rs.append(e.cave) + return rs + + def get_file_path(self): return Path(settings.ENTRANCEDESCRIPTIONS, self.filename) |