IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 29 Wiki Activity

18_File_upload_in_certain_folders #21

Merged
mpeltriaux merged 8 commits from 18_File_upload_in_certain_folders into master 2021-09-17 11:08:01 +02:00
Conversation 0 Commits 8 Files Changed 25 +16 -8
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 270f9ab7d2 - Show all commits

6
compensation/models.py
View File

@ -208,7 +208,8 @@ class CompensationDocument(AbstractDocument):
related_name="documents",
)
file = models.FileField(
upload_to=generate_document_file_upload_path
upload_to=generate_document_file_upload_path,
max_length=1000,
)
@ -323,7 +324,8 @@ class EcoAccountDocument(AbstractDocument):
related_name="documents",
)
file = models.FileField(
upload_to=generate_document_file_upload_path
upload_to=generate_document_file_upload_path,
max_length=1000,
)

3
ema/models.py
View File

@ -97,5 +97,6 @@ class EmaDocument(AbstractDocument):
related_name="documents",
)
file = models.FileField(
upload_to=generate_document_file_upload_path
upload_to=generate_document_file_upload_path,
max_length=1000,
)

8
intervention/models.py
View File

@ -86,7 +86,8 @@ class RevocationDocument(AbstractDocument):
related_name="document",
)
file = models.FileField(
upload_to=generate_document_file_upload_path
upload_to=generate_document_file_upload_path,
max_length=1000,
)
@property
@ -334,5 +335,6 @@ class InterventionDocument(AbstractDocument):
related_name="documents",
)
file = models.FileField(
upload_to=generate_document_file_upload_path
)
upload_to=generate_document_file_upload_path,
max_length=1000,
)

7
konova/utils/documents.py
View File

@ -5,7 +5,7 @@ Contact: michel.peltriaux@sgdnord.rlp.de
Created on: 01.09.21
"""
from django.http import FileResponse, HttpRequest
from django.http import FileResponse, HttpRequest, HttpResponse, Http404
from django.utils.translation import gettext_lazy as _
from konova.forms import RemoveModalForm
@ -22,7 +22,10 @@ def get_document(doc: AbstractDocument):
Returns:
"""
return FileResponse(doc.file, as_attachment=True)
try:
return FileResponse(doc.file, as_attachment=True)
except FileNotFoundError:
raise Http404()
def remove_document(request: HttpRequest, doc: AbstractDocument):