Revert "turn on banner for 1%"

[edumed.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index 36d793f..97fc027 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -3,13 +3,14 @@ from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import UploadedFile
 from django.core.mail import send_mail, mail_managers
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import UploadedFile
 from django.core.mail import send_mail, mail_managers

-from django.core.urlresolvers import reverse

 from django.core.validators import validate_email
 from django import forms
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
 from django.core.validators import validate_email
 from django import forms
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 

+from . import mailing
+

 
 contact_forms = {}
 admin_list_width = 0
 
 contact_forms = {}
 admin_list_width = 0


@@ -31,10 +32,12 @@ class ContactForm(forms.Form):
     __metaclass__ = ContactFormMeta
 
     form_tag = None
     __metaclass__ = ContactFormMeta
 
     form_tag = None

+    old_form_tags = []

     form_title = _('Contact form')
     submit_label = _('Submit')
     admin_list = None
     result_page = False
     form_title = _('Contact form')
     submit_label = _('Submit')
     admin_list = None
     result_page = False

+    mailing_field = None

 
     required_css_class = 'required'
     contact = NotImplemented
 
     required_css_class = 'required'
     contact = NotImplemented


@@ -106,5 +109,8 @@ class ContactForm(forms.Form):
                         'contact/mail_body.txt',
                     ], dictionary, context)
             send_mail(mail_subject, mail_body, 'no-reply@%s' % site.domain, [contact.contact], fail_silently=True)
                         'contact/mail_body.txt',
                     ], dictionary, context)
             send_mail(mail_subject, mail_body, 'no-reply@%s' % site.domain, [contact.contact], fail_silently=True)

+            if self.mailing_field and self.cleaned_data[self.mailing_field]:
+                email = self.cleaned_data['contact']
+                mailing.subscribe(email)

 
         return contact
 
         return contact