diff options
Diffstat (limited to 'core/views')
-rw-r--r-- | core/views/caves.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index fa51263..ef234c1 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -146,26 +146,19 @@ def entranceindex(request): ) - def cave3d(request, cave_id=""): """This is used to create a download url in templates/cave.html if anyone wants to download the .3d file The caller template tries kataster first, then unofficial_number if that kataster number does not exist but only if Cave.survex_file is non-empty - - But the template file cave.html has its own ideas about the name of the file and thus the href. Ouch. - /cave/3d/<cave_id> """ try: cave = getCave(cave_id) except ObjectDoesNotExist: return HttpResponseNotFound except Cave.MultipleObjectsReturned: - # But only one might have survex data? So scan and return the first that works. - caves = getCaves(cave_id) - for c in caves: - if c.survex_file: - # exists, but may not be a valid file path to a valid .svx file in the Loser repo - return file3d(request, c, c.slug) + # should really produce a better error message. This is a failure of ambiguous aliases probably. + caves = Cave.objects.filter(url=kpath) + return render(request, "svxcaveseveral.html", {"settings": settings, "caves": caves}) else: return file3d(request, cave, cave_id) |