summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2019-04-14 22:45:31 +0100
committerSam Wenham <sam@wenhams.co.uk>2019-04-14 22:45:31 +0100
commit23df89cf319f05cbad4cb769c05c5699fe9d3f4a (patch)
treeb2fdc953496cd2fd0b7c75fdf4e65a022b730581 /core
parentd1d0c24ed8864e88f1f6e74c5ac5776fdeaf6f5a (diff)
downloadtroggle-23df89cf319f05cbad4cb769c05c5699fe9d3f4a.tar.gz
troggle-23df89cf319f05cbad4cb769c05c5699fe9d3f4a.tar.bz2
troggle-23df89cf319f05cbad4cb769c05c5699fe9d3f4a.zip
Fix CSRF issues in svx form
Set date formats Add DataIssue model and add errors to it to allow us to give people a list of stuff to fix
Diffstat (limited to 'core')
-rw-r--r--core/admin.py1
-rw-r--r--core/models.py8
-rw-r--r--core/views_logbooks.py2
-rw-r--r--core/views_survex.py4
4 files changed, 13 insertions, 2 deletions
diff --git a/core/admin.py b/core/admin.py
index 59c93f2..71bbd61 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -139,6 +139,7 @@ admin.site.register(SurvexStation)
admin.site.register(SurvexScansFolder)
admin.site.register(SurvexScanSingle)
+admin.site.register(DataIssue)
def export_as_json(modeladmin, request, queryset):
response = HttpResponse(content_type="text/json")
diff --git a/core/models.py b/core/models.py
index d978eaa..195d38f 100644
--- a/core/models.py
+++ b/core/models.py
@@ -870,3 +870,11 @@ class Survey(TroggleModel):
def elevations(self):
return self.scannedimage_set.filter(contents='elevation')
+
+class DataIssue(TroggleModel):
+ date = models.DateTimeField(auto_now_add=True, blank=True)
+ parser = models.CharField(max_length=50, blank=True, null=True)
+ message = models.CharField(max_length=400, blank=True, null=True)
+
+ def __unicode__(self):
+ return u"%s - %s" % (self.parser, self.message)
diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index b8069da..1bc709c 100644
--- a/core/views_logbooks.py
+++ b/core/views_logbooks.py
@@ -54,7 +54,7 @@ def personindex(request):
if person.bisnotable():
notablepersons.append(person)
- return render(request,'personindex.html', {'persons': persons, 'personss':personss, 'notablepersons':notablepersons, })
+ return render(request,'personindex.html', {'persons': persons, 'personss':personss, 'notablepersons':notablepersons})
def expedition(request, expeditionname):
diff --git a/core/views_survex.py b/core/views_survex.py
index a0f4637..1e6c1bf 100644
--- a/core/views_survex.py
+++ b/core/views_survex.py
@@ -1,6 +1,7 @@
from django import forms
from django.http import HttpResponseRedirect, HttpResponse
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, render
+from django.core.context_processors import csrf
from django.http import HttpResponse, Http404
import re
import os
@@ -172,6 +173,7 @@ def svx(request, survex_file):
'difflist': difflist,
'logmessage':logmessage,
'form':form}
+ vmap.update(csrf(request))
if outputtype == "ajax":
return render_to_response('svxfiledifflistonly.html', vmap)
return render_to_response('svxfile.html', vmap)