update librarian

[edumed.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index 2cea310..019b38e 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -9,6 +9,8 @@ from django.template.loader import render_to_string
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
 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


@@ -18,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
 
 


@@ -30,12 +33,17 @@ 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
     form_title = _('Contact form')
     submit_label = _('Submit')
     admin_list = None

+    result_page = False
+    mailing_field = None
+    mailing = False
+    data_processing = None

 
     required_css_class = 'required'
 
     required_css_class = 'required'

-    contact = forms.CharField(max_length=128)
+    contact = NotImplemented

 
     def save(self, request, formsets=None):
         from .models import Attachment, Contact
 
     def save(self, request, formsets=None):
         from .models import Attachment, Contact


@@ -52,7 +60,7 @@ class ContactForm(forms.Form):
                         sub_body[name] = value
                 if sub_body:
                     body.setdefault(f.form_tag, []).append(sub_body)
                         sub_body[name] = value
                 if sub_body:
                     body.setdefault(f.form_tag, []).append(sub_body)

-                
+

         contact = Contact.objects.create(
             body=body,
             ip=request.META['REMOTE_ADDR'],
         contact = Contact.objects.create(
             body=body,
             ip=request.META['REMOTE_ADDR'],


@@ -91,10 +99,21 @@ class ContactForm(forms.Form):
                     'contact/%s/mail_subject.txt' % self.form_tag,
                     'contact/mail_subject.txt', 
                 ], dictionary, context).strip()
                     'contact/%s/mail_subject.txt' % self.form_tag,
                     'contact/mail_subject.txt', 
                 ], dictionary, context).strip()

-            mail_body = render_to_string([
-                    'contact/%s/mail_body.txt' % self.form_tag,
-                    'contact/mail_body.txt', 
-                ], dictionary, context)
+            if self.result_page:
+                mail_body = render_to_string(
+                    'contact/%s/results_email.txt' % contact.form_tag,
+                    {
+                        'contact': contact,
+                        'results': self.results(contact),
+                    }, context)
+            else:
+                mail_body = render_to_string([
+                        'contact/%s/mail_body.txt' % self.form_tag,
+                        'contact/mail_body.txt',
+                    ], dictionary, context)

             send_mail(mail_subject, mail_body, 'no-reply@%s' % site.domain, [contact.contact], fail_silently=True)
             send_mail(mail_subject, mail_body, 'no-reply@%s' % site.domain, [contact.contact], fail_silently=True)

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

 
         return contact
 
         return contact