From 0997fd09018455935e7ff28f10e001577f3a8dac Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Mon, 26 Apr 2021 18:18:16 +0100 Subject: rename ScansFolder class as Wallet --- core/views/surveys.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/views/surveys.py') diff --git a/core/views/surveys.py b/core/views/surveys.py index cf18fdd..d2d2fac 100644 --- a/core/views/surveys.py +++ b/core/views/surveys.py @@ -8,7 +8,7 @@ from django.conf import settings from django.shortcuts import render from django.http import HttpResponse, Http404 -from troggle.core.models.survex import ScansFolder, SingleScan, SurvexBlock, DrawingFile +from troggle.core.models.survex import Wallet, SingleScan, SurvexBlock, DrawingFile from troggle.core.views.expo import getmimetype import parsers.surveys @@ -21,9 +21,9 @@ and render a user-friendly error page. ''' def scanswallet(request, path): - #print [ s.walletname for s in ScansFolder.objects.all() ] + #print [ s.walletname for s in Wallet.objects.all() ] try: - scansfolder = ScansFolder.objects.get(walletname=urlunquote(path)) + scansfolder = Wallet.objects.get(walletname=urlunquote(path)) return render(request, 'scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings }) except: message = f'Scan folder error or not found \'{path}\' .' @@ -33,7 +33,7 @@ def scansingle(request, path, file): '''sends a single binary file to the user for display - browser decides how using mimetype ''' try: - scansfolder = ScansFolder.objects.get(walletname=urlunquote(path)) + scansfolder = Wallet.objects.get(walletname=urlunquote(path)) singlescan = SingleScan.objects.get(scansfolder=scansfolder, name=file) # print(" - scansingle {}:{}:{}:".format(path, file, getmimetype(file))) return HttpResponse(content=open(singlescan.ffile,"rb"), content_type=getmimetype(file)) # any type of image @@ -43,7 +43,7 @@ def scansingle(request, path, file): def scanswallets(request): - manyscansfolders = ScansFolder.objects.all() + manyscansfolders = Wallet.objects.all() return render(request, 'manyscansfolders.html', { 'manyscansfolders':manyscansfolders, 'settings': settings }) -- cgit v1.2.3