diff options
Diffstat (limited to 'core/views/caves.py')
| -rw-r--r-- | core/views/caves.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index d71749c..1e9106c 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -19,6 +19,7 @@ from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLo from troggle.core.models.logbooks import CaveSlug, QM from troggle.core.models.wallets import Wallet from troggle.core.utils import write_and_commit +from troggle.core.utils import current_expo from troggle.core.views import expo from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS from troggle.parsers.caves import read_cave, read_entrance @@ -152,7 +153,7 @@ def caveindex(request): "caves1627": caves1627, "caves1624": caves1624, "notablecaves": getnotablecaves(), - "cavepage": True}, + "cavepage": True, "year": current_expo()}, ) def entranceindex(request): @@ -177,7 +178,7 @@ def cave3d(request, cave_id=""): except Cave.MultipleObjectsReturned: # 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}) + return render(request, "svxcaveseveral.html", {"settings": settings, "caves": caves, "year": current_expo()}) else: return file3d(request, cave, cave_id) @@ -296,7 +297,8 @@ def rendercave(request, cave, slug, cave_id=""): "cave_id": cave_id, "svxstem": str(svxstem), "svx3d": svx3d, - "wallets": wallets, + "wallets": wallets, + "year": current_expo() } # Do not catch any exceptions here: propagate up to caller @@ -460,7 +462,7 @@ def edit_cave(request, path="", slug=None): { "form": form, "cave": cave, - "message": message, + "message": message, "year": current_expo(), #"caveAndEntranceFormSet": ceFormSet, "path": path + "/", # used for saving images if attached }, @@ -652,7 +654,7 @@ def edit_entrance(request, path="", caveslug=None, entslug=None): return render( request, "editentrance.html", - { + { "year": current_expo(), "entform": entform, "cave": cave, "ent": entrance, @@ -670,7 +672,7 @@ def ent(request, cave_id, ent_letter): return render( request, "entrance.html", - { + { "year": current_expo(), "cave": cave, "entrance": cave_and_ent.entrance, "letter": cave_and_ent.entranceletter, @@ -683,7 +685,7 @@ def cave_debug(request): return render( request, "cave_debug.html", - {"ents": ents, "caves": caves}, + {"ents": ents, "caves": caves, "year": current_expo()}, ) def caveslist(request): @@ -692,7 +694,7 @@ def caveslist(request): return render( request, "caveslist.html", - {"caves": caves}, + {"caves": caves, "year": current_expo()}, ) def get_entrances(request, caveslug): try: @@ -700,7 +702,7 @@ def get_entrances(request, caveslug): except: return render(request, "errors/badslug.html", {"badslug": f"{caveslug} - from get_entrances()"}) return render( - request, "options.html", {"items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]} + request, "options.html", {"year": current_expo(), "items": [(e.entrance.slug(), e.entrance.slug()) for e in cave.entrances()]} ) @@ -717,9 +719,9 @@ def caveQMs(request, slug, open=False): if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated: return render(request, "nonpublic.html", {"instance": cave}) elif open: - return render(request, "cave_open_qms.html", {"cave": cave}) + return render(request, "cave_open_qms.html", {"cave": cave, "year": current_expo()}) else: - return render(request, "cave_qms.html", {"cave": cave}) + return render(request, "cave_qms.html", {"cave": cave, "year": current_expo()}) def qm(request, cave_id, qm_id, year, grade=None, blockname=None): @@ -780,7 +782,7 @@ def qm(request, cave_id, qm_id, year, grade=None, blockname=None): qm, f"{qmslug=}:{cave_id=} {year=} {qm_id=} {blockname=} {qm.expoyear=} {qm.completion_description=}", ) - return render(request, "qm.html", {"qm": qm}) + return render(request, "qm.html", {"qm": qm, "year": current_expo()}) else: # raise return render( |