From 08a41941f9e2b35b16548624d5070216dd933f79 Mon Sep 17 00:00:00 2001 From: Sam Wenham Date: Tue, 16 Jul 2019 00:07:37 +0100 Subject: Part one of getting troggle to work with django 1.10 Major rework of how survex is processed --- core/view_surveys.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'core/view_surveys.py') diff --git a/core/view_surveys.py b/core/view_surveys.py index aad48c3..04c6ca6 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -1,6 +1,6 @@ from django.conf import settings import fileAbstraction -from django.shortcuts import render_to_response +from django.shortcuts import render from django.http import HttpResponse, Http404 import os, stat import re @@ -86,7 +86,7 @@ def jgtfile(request, f): upperdirs.append((href, hpath)) upperdirs.append(("", "/")) - return render_to_response('listdir.html', {'file':f, 'listdirfiles':listdirfiles, 'listdirdirs':listdirdirs, 'upperdirs':upperdirs, 'settings': settings}) + return render(request, 'listdir.html', {'file':f, 'listdirfiles':listdirfiles, 'listdirdirs':listdirdirs, 'upperdirs':upperdirs, 'settings': settings}) # flat output of file when loaded if os.path.isfile(fp): @@ -163,27 +163,27 @@ def jgtuploadfile(request): #print ("FFF", request.FILES.values()) message = "" print "gothere" - return render_to_response('fileupload.html', {'message':message, 'filesuploaded':filesuploaded, 'settings': settings}) + return render(request, 'fileupload.html', {'message':message, 'filesuploaded':filesuploaded, 'settings': settings}) def surveyscansfolder(request, path): #print [ s.walletname for s in SurvexScansFolder.objects.all() ] survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.unquote(path)) - return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) + return render(request, 'survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) def surveyscansingle(request, path, file): survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.unquote(path)) survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file) return HttpResponse(content=open(survexscansingle.ffile), content_type=getMimeType(path.split(".")[-1])) - #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) + #return render(request, 'survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) def surveyscansfolders(request): survexscansfolders = SurvexScansFolder.objects.all() - return render_to_response('survexscansfolders.html', { 'survexscansfolders':survexscansfolders, 'settings': settings }) + return render(request, 'survexscansfolders.html', { 'survexscansfolders':survexscansfolders, 'settings': settings }) def tunneldata(request): tunnelfiles = TunnelFile.objects.all() - return render_to_response('tunnelfiles.html', { 'tunnelfiles':tunnelfiles, 'settings': settings }) + return render(request, 'tunnelfiles.html', { 'tunnelfiles':tunnelfiles, 'settings': settings }) def tunnelfile(request, path): -- cgit v1.2.3