Showing exercices left to mark in admin list view of Submissions

[edumed.git] / contact / views.py

diff --git a/contact/views.py b/contact/views.py
index d18598c..245433e 100644 (file)
--- a/contact/views.py
+++ b/contact/views.py
@@ -14,23 +14,36 @@ def form(request, form_tag):
         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)

-        if form.is_valid():
-            form.save(request)
+        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)
             return redirect('contact_thanks', form_tag)
     else:
         form = form_class(initial=request.GET)

+        formsets = []
+        for formset in getattr(form, 'form_formsets', ()):
+            formsets.append(formset())

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

-                {'form': form}
+                {'form': form, 'formsets': formsets}

             )
 
 
 def thanks(request, form_tag):
             )
 
 
 def thanks(request, form_tag):

-    if form_tag not in contact_forms:
+    try:
+        form_class = contact_forms[form_tag]
+    except KeyError:

         raise Http404
 
     return render(request,
         raise Http404
 
     return render(request,

-                ['contact/%s/thanks.html' % form_tag, 'contact/thanks.html']
+                ['contact/%s/thanks.html' % form_tag, 'contact/thanks.html'],
+                dict(base_template = getattr(form_class, 'base_template', None))

             )
 
 
             )