fix

[wolnelektury.git] / src / contact / views.py

diff --git a/src/contact/views.py b/src/contact/views.py
index 82e0347..0f8aad9 100644 (file)
--- a/src/contact/views.py
+++ b/src/contact/views.py
@@ -1,28 +1,36 @@
-# -*- coding: utf-8 -*-
-from urllib import unquote
+from urllib.parse 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.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 fnpdjango.utils.views import serve_file
 from honeypot.decorators import check_honeypot
 

+from wolnelektury.utils import localtime_to_utc

 from .forms import contact_forms
 from .models import Attachment, Contact
 
 
 @check_honeypot
 from .forms import contact_forms
 from .models import Attachment, Contact
 
 
 @check_honeypot

+@never_cache

 def form(request, form_tag, force_enabled=False):
     try:
         form_class = contact_forms[form_tag]
     except KeyError:
         raise Http404
 def form(request, form_tag, force_enabled=False):
     try:
         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, {'title': form_class.form_title})
-        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:
+            template = getattr(form_class, 'disabled_template', None)
+            if template:
+                return render(request, template, {'title': form_class.form_title})
+            raise Http404

     if request.method == 'POST':
         form = form_class(request.POST, request.FILES)
     else:
     if request.method == 'POST':
         form = form_class(request.POST, request.FILES)
     else:


@@ -31,7 +39,7 @@ def form(request, form_tag, force_enabled=False):
     if request.method == 'POST':
         formsets = {
             prefix: formset_class(request.POST, request.FILES, prefix=prefix)
     if request.method == 'POST':
         formsets = {
             prefix: formset_class(request.POST, request.FILES, prefix=prefix)

-            for prefix, formset_class in formset_classes.iteritems()}
+            for prefix, formset_class in formset_classes.items()}

         if form.is_valid() and all(formset.is_valid() for formset in formsets.itervalues()):
             contact = form.save(request, formsets.values())
             if form.result_page:
         if form.is_valid() and all(formset.is_valid() for formset in formsets.itervalues()):
             contact = form.save(request, formsets.values())
             if form.result_page:


@@ -39,7 +47,7 @@ def form(request, form_tag, force_enabled=False):
             else:
                 return redirect('contact_thanks', form_tag)
     else:
             else:
                 return redirect('contact_thanks', form_tag)
     else:

-        formsets = {prefix: formset_class(prefix=prefix) for prefix, formset_class in formset_classes.iteritems()}
+        formsets = {prefix: formset_class(prefix=prefix) for prefix, formset_class in formset_classes.items()}

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