From 09fad6a2de1ca93a76535100201f4957e07f6e9b Mon Sep 17 00:00:00 2001 From: mipel Date: Mon, 26 Jul 2021 15:34:30 +0200 Subject: [PATCH] Document upload fix * fixes some minor issues with the document upload --- intervention/views.py | 5 ++--- konova/forms.py | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/intervention/views.py b/intervention/views.py index f3f5e72c..4ef15dd9 100644 --- a/intervention/views.py +++ b/intervention/views.py @@ -83,13 +83,12 @@ def new_document_view(request: HttpRequest, id: str): Returns: """ - form = NewDocumentForm(request.POST, request.FILES, user=request.user) + intervention = get_object_or_404(Intervention, id=id) + form = NewDocumentForm(request.POST or None, request.FILES or None, instance=intervention, user=request.user) template = form.template if request.method == "POST": if form.is_valid(): doc = form.save() - intervention = get_object_or_404(Intervention, id=id) - intervention.documents.add(doc) messages.success( request, _("Document '{}' added").format(doc.title) diff --git a/konova/forms.py b/konova/forms.py index 0fd5cc7d..a3384029 100644 --- a/konova/forms.py +++ b/konova/forms.py @@ -177,6 +177,8 @@ class NewDocumentForm(BaseModalForm): """ title = forms.CharField( + label=_("Title"), + label_suffix=_(""), max_length=500, ) creation_date = forms.DateField( @@ -195,13 +197,23 @@ class NewDocumentForm(BaseModalForm): label=_("File"), label_suffix=_(""), help_text=_("Must be smaller than 15 Mb"), + widget=forms.FileInput( + attrs={ + "class": "w-75" + } + ) ) comment = forms.CharField( required=False, label=_("Comment"), label_suffix=_(""), help_text=_("Additional comment on this file"), - widget=forms.Textarea() + widget=forms.Textarea( + attrs={ + "cols": 30, + "rows": 5, + } + ) ) def __init__(self, *args, **kwargs): @@ -222,4 +234,5 @@ class NewDocumentForm(BaseModalForm): document=self.cleaned_data["file"], date_of_creation=self.cleaned_data["creation_date"], ) + self.instance.documents.add(doc) return doc