xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

fix template bug for newentrance

Browse Source
This commit is contained in:
Philip Sargent
2021-04-17 23:59:11 +01:00
parent d4317b5fd3
commit eea74406c9
8 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/views/caves.py
View File

@@ -226,9 +226,16 @@ def rendercave(request, cave, slug, cave_id=''):
editable = True
else:
editable = False
print(" ! rendercave:'{}' svxstem:{} svx3d:'{}'".format(cave, svxstem, svx3d))
return render(request,'cave.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
#print(f" ! rendercave:'{cave}' svxstem:{svxstem} caveid:'{cave_id}' svx3d:'{svx3d}'")
try:
r = render(request,'cave.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
return r
except:
raise
return render(request,'errors/generic.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
def cavepage(request, karea, subpath):
'''Displays a cave description page
@@ -249,10 +256,12 @@ def cavepage(request, karea, subpath):
return expo.expopage(request, path)
except Cave.MultipleObjectsReturned:
caves = Cave.objects.filter(url = path)
# we should have a -several variant for the cave pages, not just the svxcaves:
return render(request, 'svxcaveseveral.html', {'settings': settings, "caves":caves })
except:
return render(request, 'pagenotfound.html', {'path': path})
raise
return render(request, 'pagenotfound.html', {'path': path}) # it does not seem possible to set the status_code to '404'
def cave(request, cave_id='', offical_name=''):
'''Displays a cave description page
accesssed by a fairly random id which might be anything