From 3c62defdfde5d048923222d761a4edc1e9d695c6 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 4 Nov 2023 18:28:14 +0200 Subject: [PATCH] fixes and bugfix --- core/views/other.py | 2 ++ core/views/scans.py | 20 ++++++++------------ parsers/caves.py | 2 +- parsers/locations.py | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/core/views/other.py b/core/views/other.py index 4d7d3f1..444f0e2 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -46,6 +46,7 @@ def todos(request, module): from troggle.core.views.drawings import todo as viewdrawings from troggle.core.views.logbooks import todo as viewlogbooks from troggle.core.views.other import todo as viewother + from troggle.core.views.scans import todo as viewscans from troggle.core.views.survex import todo as viewsurvex from troggle.core.views.uploads import todo as viewuploads from troggle.core.views.wallets_edit import todo as viewwallets_edit @@ -66,6 +67,7 @@ def todos(request, module): "views/drawings": viewdrawings, "views/logbooks": viewlogbooks, "views/other": todo, + "views/scans": viewscans, "views/survex": viewsurvex, "views/uploads": viewuploads, "views/wallets_edit": viewwallets_edit, diff --git a/core/views/scans.py b/core/views/scans.py index 2494cd9..f80f08c 100644 --- a/core/views/scans.py +++ b/core/views/scans.py @@ -16,22 +16,18 @@ from troggle.parsers.people import GetPersonExpeditionNameLookup from troggle.parsers.survex import set_walletdate -"""one of these views serves files as binary blobs, and simply set the mime type based on the file extension, +""" +Note that caveifywallet() etc do NOT save the object to the db. They are ephemeral, just for the page rendering of the +manywallets dict. +""" + +todo=""" +- one of these views serves files as binary blobs, and simply set the mime type based on the file extension, as does the urls.py dispatcher which sends them here. Here they should actually have the filetype checked by looking inside the file before being served. -need to check if inavlid query string is invalid, or produces multiple replies +- need to check if inavlid query string is invalid, or produces multiple replies and render a user-friendly error page. - -Note that caveifywallet() etc do NOT save the object to the db. They are ephemeral, just for the page rendering of the -manywallets dict. - -TODO - --- add the participants on an explicit wallet list to .slugpeople so that they get proper URL-linked -on the per-person wallet report, and do the same thing for per-cave and per-year wallet reports - -add this file in to the todo list thinggy. """ def fix_manywallets(many): diff --git a/parsers/caves.py b/parsers/caves.py index 22624b2..4580e82 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -671,7 +671,7 @@ def read_cave(filename, cave=None): #raise # This fails to do an update! It just crashes.. to be fixed message = f" ! CaveSlug update/create failure : {slug}, skipping file cave_data/{context} with exception\nException: {ex.__class__}" - DataIssue.objects.create(parser="caves", message=message, url=f"{cave.url()}_edit/") + DataIssue.objects.create(parser="caves", message=message, url=f"{cave.url}_edit/") print(message) primary = False diff --git a/parsers/locations.py b/parsers/locations.py index bdb2fff..6c079cd 100644 --- a/parsers/locations.py +++ b/parsers/locations.py @@ -24,7 +24,7 @@ entrances """ todo = """ -- Pending a complete revision of how we handle GPS coordinates of entrances. +- """ class MapLocations(object):