From 17bbbd6eabe24b169c66f2c6534f0b0589a69744 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 24 Aug 2022 19:08:08 +0300 Subject: get the survexfile path when editing a naked wallet --- core/views/uploads.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'core/views/uploads.py') diff --git a/core/views/uploads.py b/core/views/uploads.py index 919f130..4a8a6de 100644 --- a/core/views/uploads.py +++ b/core/views/uploads.py @@ -28,7 +28,7 @@ from troggle.parsers.scans import contentsjson from troggle.core.models.troggle import DataIssue from troggle.core.models.troggle import Expedition, Person, PersonExpedition from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip -from troggle.core.models.survex import DrawingFile, Wallet +from troggle.core.models.survex import DrawingFile, Wallet, SurvexBlock from troggle.core.views.scans import oldwallet, walletindex from troggle.core.views.caves import getCave @@ -251,6 +251,12 @@ def scanupload(request, path=None): else: # no JSON file exists print(f'--- No JSON exists, so creating blank copy') waldata = WALLET_BLANK_JSON.copy() + if not waldata["survex file"]: + w = Wallet.objects.get(walletname=wallet) + b = SurvexBlock.objects.filter(scanswallet=w) + waldata["survex file"] = [] + for bsf in b: + waldata["survex file"].append(bsf.survexfile.path) return waldata def save_json(jsondict): -- cgit v1.2.3