arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-25 17:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Removed special characters from paperwork filenames - issue #103

Browse Source
This commit is contained in:
David Taylor
2015-06-29 23:27:10 +01:00
parent 0b63bbcc5b
commit e7c39c2b81
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RIGS/finance.py
View File

@@ -14,6 +14,7 @@ from z3c.rml import rml2pdf
from RIGS import models from RIGS import models
import re
class InvoiceIndex(generic.ListView): class InvoiceIndex(generic.ListView):
model = models.Invoice model = models.Invoice
@@ -63,8 +64,10 @@ class InvoicePrint(generic.View):
pdfData = buffer.read() pdfData = buffer.read()
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name)
response = HttpResponse(content_type='application/pdf') response = HttpResponse(content_type='application/pdf')
response['Content-Disposition'] = "filename=Invoice %05d | %s.pdf" % (invoice.pk, object.name) response['Content-Disposition'] = "filename=Invoice %05d | %s.pdf" % (invoice.pk, escapedEventName)
response.write(pdfData) response.write(pdfData)
return response return response

2
RIGS/models.py
View File

@@ -355,7 +355,7 @@ class Event(models.Model, RevisionMixin):
return reverse_lazy('event_detail', kwargs={'pk': self.pk}) return reverse_lazy('event_detail', kwargs={'pk': self.pk})
def __str__(self): def __str__(self):
return str(self.pk) + ": " + self.name return unicode(self.pk) + ": " + self.name
class Meta: class Meta:
permissions = ( permissions = (

5
RIGS/rigboard.py
View File

@@ -124,7 +124,10 @@ class EventPrint(generic.View):
merger.write(merged) merger.write(merged)
response = HttpResponse(content_type='application/pdf') response = HttpResponse(content_type='application/pdf')
response['Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, object.name)
escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name)
response['Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName)
response.write(merged.getvalue()) response.write(merged.getvalue())
return response return response