Fixes #3314, #3331: Various minor fixes.

[edumed.git] / contact / views.py

diff --git a/contact/views.py b/contact/views.py
index 26ccf60..6ec18e5 100644 (file)
--- a/contact/views.py
+++ b/contact/views.py
@@ -12,6 +12,11 @@ def form(request, form_tag):
         form_class = contact_forms[form_tag]
     except KeyError:
         raise Http404
         form_class = contact_forms[form_tag]
     except KeyError:
         raise Http404

+    if getattr(form_class, 'disabled', False):
+        template = getattr(form_class, 'disabled_template', None)
+        if template:
+            return render(request, template)
+        raise Http404

     if request.method == 'POST':
         form = form_class(request.POST, request.FILES)
         formsets = []
     if request.method == 'POST':
         form = form_class(request.POST, request.FILES)
         formsets = []


@@ -36,11 +41,14 @@ def form(request, form_tag):
 
 
 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))

             )
 
 
             )