UPD: dav_submission: included some feedback from manu.

This commit is contained in:
2019-05-15 13:04:41 +02:00
parent 506abd02c8
commit d8919f3394
6 changed files with 37 additions and 9 deletions

View File

@@ -5,6 +5,7 @@ import logging
import os
from django.apps import apps
from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.urls import reverse_lazy
from django.utils.translation import ugettext as _
from django.views import generic
@@ -19,6 +20,7 @@ class UploadView(generic.edit.FormView):
initial = {
# 'name': u'heinzel',
# 'email_address': 'heinzel@heinzelwelt.de',
# 'group': 'Alte Maschinen',
# 'title': u'Mein Beitrag',
# 'description': 'Foobar',
# 'accepted': True,
@@ -57,6 +59,11 @@ class UploadView(generic.edit.FormView):
return r[:max_length]
def get_context_data(self, **kwargs):
c = super(UploadView, self).get_context_data(**kwargs)
c['show_upload_form'] = app_config.settings.enable_upload
return c
def form_valid(self, form):
base_path = app_config.settings.upload_path
@@ -81,6 +88,7 @@ class UploadView(generic.edit.FormView):
try:
metadata_format_str = u"""Absender: {name} <{email_address}>
Gruppe: {group}
Datum: {date} {time}
Titel: {title}
Beschreibung:
@@ -91,6 +99,7 @@ Beschreibung:
'time': now.strftime('%H:%M:%S'),
'name': form.cleaned_data['name'],
'email_address': form.cleaned_data['email_address'],
'group': form.cleaned_data['group'],
'title': form.cleaned_data['title'],
'description': form.cleaned_data['description'],
}
@@ -139,6 +148,11 @@ Beschreibung:
return super(UploadView, self).form_valid(form)
def post(self, request, *args, **kwargs):
if not app_config.settings.enable_upload:
raise PermissionDenied(_(u'Der Upload ist noch nicht freigeschaltet.'))
return super(UploadView, self).post(request, *args, **kwargs)
class SuccessView(generic.TemplateView):
template_name = 'dav_submission/success.html'