arbiters not required

[edumed.git] / contact / views.py

diff --git a/contact/views.py b/contact/views.py
index e52b6b2..5a2f2ae 100644 (file)
--- a/contact/views.py
+++ b/contact/views.py
@@ -5,10 +5,13 @@ from django.contrib.auth.decorators import permission_required
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from fnpdjango.utils.views import serve_file
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from fnpdjango.utils.views import serve_file

+from honeypot.decorators import check_honeypot
+

 from .forms import contact_forms
 from .models import Attachment
 
 
 from .forms import contact_forms
 from .models import Attachment
 
 

+@check_honeypot

 def form(request, form_tag, force_enabled=False):
     try:
         form_class = contact_forms[form_tag]
 def form(request, form_tag, force_enabled=False):
     try:
         form_class = contact_forms[form_tag]


@@ -22,21 +25,19 @@ def form(request, form_tag, force_enabled=False):
         raise Http404
     if request.method == 'POST':
         form = form_class(request.POST, request.FILES)
         raise Http404
     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)
-            return redirect('contact_thanks', form_tag)

     else:
         form = form_class(initial=request.GET)
     else:
         form = form_class(initial=request.GET)

-        formsets = []
-        for formset in getattr(form, 'form_formsets', ()):
-            formsets.append(formset())
+    formset_classes = getattr(form, 'form_formsets', {})
+    if request.method == 'POST':
+        formsets = {
+            prefix: formset_class(request.POST, request.FILES, prefix=prefix)
+            for prefix, formset_class in formset_classes.iteritems()}
+        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:
+        formsets = {prefix: formset_class(prefix=prefix) for prefix, formset_class in formset_classes.iteritems()}
+

     return render(
         request, ['contact/%s/form.html' % form_tag, 'contact/form.html'],
         {'form': form, 'formsets': formsets}
     return render(
         request, ['contact/%s/form.html' % form_tag, 'contact/form.html'],
         {'form': form, 'formsets': formsets}