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 0d8c0bc..56bfd42 100644 (file)
--- a/contact/views.py
+++ b/contact/views.py
@@ -1,51 +1,54 @@
 # -*- coding: utf-8 -*-
 from urllib import unquote
 
-from datetime import datetime
 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.utils import timezone
 from django.views.decorators.cache import never_cache
 from fnpdjango.utils.views import serve_file
 from honeypot.decorators import check_honeypot
 
-from edumed.utils import localtime_to_utc
-from .forms import contact_forms
-from .models import Attachment
+from .forms import contact_forms, update_forms
+from .models import Attachment, Contact
 
 
 @check_honeypot
 @never_cache
-def form(request, form_tag, force_enabled=False):
+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 not (force_enabled and request.user.is_superuser):
-        disabled = getattr(form_class, 'disabled', False)
-        end_tuple = getattr(form_class, 'ends_on', None)
-        end_time = localtime_to_utc(datetime(*end_tuple)) if end_tuple else None
-        expired = end_time and end_time < timezone.now()
-        if disabled or expired:
+        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)
+        form = form_class(request.POST, request.FILES, instance=contact)
     else:
-        form = form_class(initial=request.GET)
-    formset_classes = getattr(form, 'form_formsets', {})
+        form = form_class(initial=request.GET, instance=contact)
     if request.method == 'POST':
-        formsets = {
-            prefix: formset_class(request.POST, request.FILES, prefix=prefix)
-            for prefix, formset_class in formset_classes.iteritems()}
+        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:
-        formsets = {prefix: formset_class(prefix=prefix) for prefix, formset_class in formset_classes.iteritems()}
+        formsets = form.get_formsets()
 
     return render(
         request, ['contact/%s/form.html' % form_tag, 'contact/form.html'],