2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-17 20:48:39 +00:00

Simple renaming too-similar variables

This commit is contained in:
Philip Sargent
2020-06-24 00:18:01 +01:00
parent 9cd70b31ac
commit c91aa4be47
10 changed files with 36 additions and 602 deletions

View File

@@ -6,7 +6,7 @@ from django.conf import settings
from django.shortcuts import render_to_response
from django.http import HttpResponse, Http404
from troggle.core.models_survex import ScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
from troggle.core.models_survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile
from troggle.flatpages import views as flatviews
import parsers.surveys
#from . import fileAbstraction
@@ -75,9 +75,9 @@ def surveyscansfolder(request, path):
def surveyscansingle(request, path, file):
scansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path))
survexscansingle = SurvexScanSingle.objects.get(scansfolder=scansfolder, name=file)
singlescan = SingleScan.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 HttpResponse(content=open(singlescan.ffile,"rb"), content_type=flatviews.getmimetype(file))
#return render_to_response('scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings })
def expofilessingle(request, filepath):