Separate club join view for app users.

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

diff --git a/src/contact/views.py b/src/contact/views.py
index 773f193..0f8aad9 100644 (file)
--- a/src/contact/views.py
+++ b/src/contact/views.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-from urllib import unquote
+from urllib.parse import unquote
 
 from datetime import datetime
 from django.contrib.auth.decorators import permission_required
@@ -24,7 +23,7 @@ def form(request, form_tag, force_enabled=False):
         raise Http404
     if not (force_enabled and request.user.is_superuser):
         disabled = getattr(form_class, 'disabled', False)
-        end_tuple = getattr(form_class, 'ends_on')
+        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:
@@ -40,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)
-            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:
@@ -48,7 +47,7 @@ def form(request, form_tag, force_enabled=False):
             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'],