From 9cd70b31acf70c0df6207211efc629b95a8860d2 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 23 Jun 2020 23:46:33 +0100 Subject: simple rename survexscansfolder to scansfolder --- core/view_surveys.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/view_surveys.py') diff --git a/core/view_surveys.py b/core/view_surveys.py index fbe5c6f..73c5790 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -70,15 +70,15 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary): def surveyscansfolder(request, path): #print [ s.walletname for s in ScansFolder.objects.all() ] - survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) - return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) + scansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) + return render_to_response('scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings }) def surveyscansingle(request, path, file): - survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) - survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file) + scansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) + survexscansingle = SurvexScanSingle.objects.get(scansfolder=scansfolder, name=file) print("SSS {} {} :{}:".format(path, file, flatviews.getmimetype(file))) return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=flatviews.getmimetype(file)) - #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) + #return render_to_response('scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings }) def expofilessingle(request, filepath): # defaults to content_type="text/pain" needs fixing for PDFs -- cgit v1.2.3