minor fixes in new forms

[edumed.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index 97fc027..019b38e 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -20,10 +20,11 @@ class ContactFormMeta(forms.Form.__class__):
     def __new__(cls, name, bases, attrs):
         global admin_list_width
         model = super(ContactFormMeta, cls).__new__(cls, name, bases, attrs)
     def __new__(cls, name, bases, attrs):
         global admin_list_width
         model = super(ContactFormMeta, cls).__new__(cls, name, bases, attrs)

-        assert model.form_tag not in contact_forms, 'Duplicate form_tag.'
-        if model.admin_list:
-            admin_list_width = max(admin_list_width, len(model.admin_list))
-        contact_forms[model.form_tag] = model
+        if model.form_tag:
+            assert model.form_tag not in contact_forms, 'Duplicate form_tag.'
+            if model.admin_list:
+                admin_list_width = max(admin_list_width, len(model.admin_list))
+            contact_forms[model.form_tag] = model

         return model
 
 
         return model
 
 


@@ -38,6 +39,8 @@ class ContactForm(forms.Form):
     admin_list = None
     result_page = False
     mailing_field = None
     admin_list = None
     result_page = False
     mailing_field = None

+    mailing = False
+    data_processing = None

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


@@ -109,7 +112,7 @@ 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]:
+            if self.mailing or (self.mailing_field and self.cleaned_data[self.mailing_field]):

                 email = self.cleaned_data['contact']
                 mailing.subscribe(email)
 
                 email = self.cleaned_data['contact']
                 mailing.subscribe(email)