summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-04-26 17:40:48 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2021-04-26 17:40:48 +0100
commitb8803c8e5b08c1439a242cea1a04f30641235220 (patch)
tree52f48de5eb8a85a387bff5c5d55f2ba35a6da7ae /core
parent9e11c0814ef1475cd51ee444acdf52244bd0cca6 (diff)
downloadtroggle-b8803c8e5b08c1439a242cea1a04f30641235220.tar.gz
troggle-b8803c8e5b08c1439a242cea1a04f30641235220.tar.bz2
troggle-b8803c8e5b08c1439a242cea1a04f30641235220.zip
rename surveyscansingle
Diffstat (limited to 'core')
-rw-r--r--core/models/survex.py2
-rw-r--r--core/views/surveys.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/models/survex.py b/core/models/survex.py
index 6b173a5..30bd9bb 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -194,7 +194,7 @@ class SingleScan(models.Model):
ordering = ('name',)
def get_absolute_url(self):
- return urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.scansfolder.walletname), "file":self.name}))
+ return urljoin(settings.URL_ROOT, reverse('scansingle', kwargs={"path":re.sub("#", "%23", self.scansfolder.walletname), "file":self.name}))
def __str__(self):
return "Survey Scan Image: " + str(self.name) + " in " + str(self.scansfolder)
diff --git a/core/views/surveys.py b/core/views/surveys.py
index 2737a05..4af5bcb 100644
--- a/core/views/surveys.py
+++ b/core/views/surveys.py
@@ -29,13 +29,13 @@ def surveyscansfolder(request, path):
message = f'Scan folder error or not found \'{path}\' .'
return render(request, 'errors/generic.html', {'message': message})
-def surveyscansingle(request, path, file):
+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))
singlescan = SingleScan.objects.get(scansfolder=scansfolder, name=file)
- # print(" - surveyscansingle {}:{}:{}:".format(path, file, getmimetype(file)))
+ # print(" - scansingle {}:{}:{}:".format(path, file, getmimetype(file)))
return HttpResponse(content=open(singlescan.ffile,"rb"), content_type=getmimetype(file)) # any type of image
except:
message = f'Scan folder or scan item error or not found \'{path}\' and \'{file}\'.'