expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00
Code Issues 19 Projects 3 Activity

add link to logbook delete in control panel

Browse Source
This commit is contained in:
Philip Sargent 2024-07-18 10:12:30 +02:00
parent 12fa55f537
commit 3ba1454f15
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/views/other.py
View File

@ -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()},
)

1
templates/controlPanel.html
View File

@ -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