From 3ba1454f15a84c75b89c509f5f188b8970ce436d Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 18 Jul 2024 10:12:30 +0200 Subject: add link to logbook delete in control panel --- core/views/other.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/views/other.py') diff --git a/core/views/other.py b/core/views/other.py index 200b57b..ed03516 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -20,7 +20,7 @@ from troggle.parsers.imports import ( import_survex, import_surveyscans, ) - +from troggle.core.utils import current_expo from .auth import login_required_if_public """Utility functions and code to serve the control panel and individual user's @@ -149,7 +149,8 @@ def controlpanel(request): return render( request, "controlPanel.html", - {"error": 'You are logged in, but not logged in as "expoadmin". \nLogout and login again to contnue.'}, + {"error": 'You are logged in, but not logged in as "expoadmin". \nLogout and login again to contnue.', "year": current_expo()} + ) else: if request.method == "POST": @@ -158,13 +159,13 @@ def controlpanel(request): return render( request, "controlPanel.html", - {"expeditions": Expedition.objects.all(), "jobs_completed": jobs_completed}, + {"expeditions": Expedition.objects.all(), "jobs_completed": jobs_completed, "year": current_expo()}, ) else: return render( request, "controlPanel.html", - {"expeditions": Expedition.objects.all(), "jobs_completed": jobs_completed}, + {"expeditions": Expedition.objects.all(), "jobs_completed": jobs_completed, "year": current_expo()}, ) -- cgit v1.2.3