diff options
Diffstat (limited to 'core/views/scans.py')
-rw-r--r-- | core/views/scans.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/views/scans.py b/core/views/scans.py index 2714716..f24b972 100644 --- a/core/views/scans.py +++ b/core/views/scans.py @@ -14,6 +14,7 @@ from troggle.core.views.expo import getmimetype from troggle.parsers.caves import add_cave_to_pending_list from troggle.parsers.people import GetPersonExpeditionNameLookup from troggle.parsers.survex import set_walletdate +from troggle.core.utils import current_expo """ @@ -255,7 +256,7 @@ def walletslistperson(request, slug): request, "personwallets.html", {"manywallets": manywallets, "settings": settings, "person": p, "expeditions": expeditions, - "length_ug": length_ug} + "length_ug": length_ug, "year": current_expo()} ) @@ -330,7 +331,7 @@ def cavewallets(request, caveid): request, "cavewallets.html", {"manywallets": manywallets, "settings": settings, "cave": cave, "expeditions": expeditions, - "length_ug": length_ug} + "length_ug": length_ug, "year": current_expo()} ) @@ -340,10 +341,10 @@ def oldwallet(request, path): print(f"! - oldwallet path:{path}") try: wallet = Wallet.objects.get(walletname=urlunquote(path)) - return render(request, "wallet_old.html", {"wallet": wallet, "settings": settings}) + return render(request, "wallet_old.html", {"wallet": wallet, "settings": settings, "year": current_expo()}) except: message = f"Scan folder error or not found '{path}' ." - return render(request, "errors/generic.html", {"message": message}) + return render(request, "errors/generic.html", {"message": message,"year": current_expo()}) def scansingle(request, path, file): @@ -377,5 +378,5 @@ def allscans(request): # manywallets = Wallet.objects.all().prefetch_related('singlescan') fails as the link is defined on 'singlescan' not on 'wallet' expeditions = Expedition.objects.all() return render( - request, "walletsall.html", {"manywallets": manywallets, "settings": settings, "expeditions": expeditions} + request, "walletsall.html", {"manywallets": manywallets, "settings": settings, "expeditions": expeditions, "year": current_expo()} ) |