fix email to teachers (don't send to None)

[edumed.git] / contact / views.py

diff --git a/contact/views.py b/contact/views.py
index 823c046..56bfd42 100644 (file)
--- a/contact/views.py
+++ b/contact/views.py
@@ -1,43 +1,58 @@
 # -*- coding: utf-8 -*-
+from urllib import unquote
+
 from django.contrib.auth.decorators import permission_required
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
+from django.views.decorators.cache import never_cache
 from fnpdjango.utils.views import serve_file
-from .forms import contact_forms
-from .models import Attachment
+from honeypot.decorators import check_honeypot
+
+from .forms import contact_forms, update_forms
+from .models import Attachment, Contact
 
 
-def form(request, form_tag, force_enabled=False):
+@check_honeypot
+@never_cache
+def form(request, form_tag, force_enabled=False, contact_id=None, key=None):
+    update = bool(contact_id and key)
     try:
-        form_class = contact_forms[form_tag]
+        if update and form_tag in update_forms:
+            form_class = update_forms[form_tag]
+        else:
+            form_class = contact_forms[form_tag]
     except KeyError:
         raise Http404
-    if (getattr(form_class, 'disabled', False) and
-            not (force_enabled and request.user.is_superuser)):
-        template = getattr(form_class, 'disabled_template', None)
-        if template:
-            return render(request, template)
-        raise Http404
+    if not (force_enabled and request.user.is_superuser):
+        if form_class.is_disabled():
+            template = getattr(form_class, 'disabled_template', None)
+            if template:
+                return render(request, template, {'title': form_class.form_title})
+            raise Http404
+    if contact_id:
+        contact = get_object_or_404(Contact, id=contact_id, form_tag=form_tag)
+        if form_tag != 'olimpiada':
+            raise Http404
+        confirmation = form_class.confirmation_class.objects.get(contact=contact)
+        if key != confirmation.key:
+            raise Http404
+    else:
+        contact = None
+    if request.method == 'POST':
+        form = form_class(request.POST, request.FILES, instance=contact)
+    else:
+        form = form_class(initial=request.GET, instance=contact)
     if request.method == 'POST':
-        form = form_class(request.POST, request.FILES)
-        formsets = []
-        valid = form.is_valid()
-        for formset in getattr(form, 'form_formsets', ()):
-            fset = formset(request.POST, request.FILES)
-            if not fset.is_valid():
-                valid = False
-            formsets.append(fset)
-        if valid:
-            form.save(request, formsets)
+        formsets = form.get_formsets(request)
+        if form.is_valid() and all(formset.is_valid() for formset in formsets.itervalues()):
+            form.save(request, formsets.values())
             return redirect('contact_thanks', form_tag)
     else:
-        form = form_class(initial=request.GET)
-        formsets = []
-        for formset in getattr(form, 'form_formsets', ()):
-            formsets.append(formset())
+        formsets = form.get_formsets()
+
     return render(
         request, ['contact/%s/form.html' % form_tag, 'contact/form.html'],
-        {'form': form, 'formsets': formsets}
+        {'form': form, 'formsets': formsets, 'formset_errors': any(formset.errors for formset in formsets.values())}
     )
 
 
@@ -55,4 +70,5 @@ def thanks(request, form_tag):
 @permission_required('contact.change_attachment')
 def attachment(request, contact_id, tag):
     attachment = get_object_or_404(Attachment, contact_id=contact_id, tag=tag)
-    return serve_file(attachment.file.url)
+    attachment_url = unquote(attachment.file.url)
+    return serve_file(attachment_url)