diff options
| -rw-r--r-- | core/views/other.py | 9 | ||||
| -rw-r--r-- | templates/controlPanel.html | 1 |
2 files changed, 6 insertions, 4 deletions
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()}, ) diff --git a/templates/controlPanel.html b/templates/controlPanel.html index 39d9bef..b8f66d5 100644 --- a/templates/controlPanel.html +++ b/templates/controlPanel.html @@ -21,6 +21,7 @@ {% endif %} <h3>Administration Utilities</h3> <ul> +<li><a href="/logreport/{{year}}">Delete logbook entry</a> -Online logbook suffers duplicate entries (needs admin logon) <li><a href="/pathsreport">Folder paths used</a> -folders settings used by this troggle installation <li><a href="/cave_data/cavealiases.txt_edit">Edit cave aliases</a> -edit historical cave aliases to current names <li><a href="/aliases/2023">Expoer name aliases</a> -short names recognised by troggle |