fix requirements + django-extensions

[prawokultury.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index 4f5cf65..de4cd74 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -1,7 +1,8 @@
 from django.contrib.sites.models import Site
 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.files.uploadedfile import UploadedFile
 from django.core.mail import send_mail, mail_managers

-from django.core.validators import email_re
+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 import forms
 from django.template.loader import render_to_string
 from django.template import RequestContext


@@ -10,10 +11,14 @@ from .models import Attachment, Contact
 
 
 contact_forms = {}
 
 
 contact_forms = {}

-class ContactFormMeta(forms.Form.__metaclass__):
+admin_list_width = 0
+class ContactFormMeta(forms.Form.__class__):

     def __new__(cls, *args, **kwargs):
     def __new__(cls, *args, **kwargs):

+        global admin_list_width

         model = super(ContactFormMeta, cls).__new__(cls, *args, **kwargs)
         assert model.form_tag not in contact_forms, 'Duplicate form_tag.'
         model = super(ContactFormMeta, cls).__new__(cls, *args, **kwargs)
         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
 
         contact_forms[model.form_tag] = model
         return model
 


@@ -22,24 +27,42 @@ class ContactForm(forms.Form):
     """Subclass and define some fields."""
     __metaclass__ = ContactFormMeta
 
     """Subclass and define some fields."""
     __metaclass__ = ContactFormMeta
 

+    started = False

     form_tag = None
     form_tag = None

-    title = _('Contact form')
+    save_as_tag = None
+    form_title = _('Contact form')

     submit_label = _('Submit')
     submit_label = _('Submit')

+    admin_list = None

 
     required_css_class = 'required'
     contact = forms.CharField(max_length=128)
 
 
     required_css_class = 'required'
     contact = forms.CharField(max_length=128)
 

+    def __init__(self, *args, **kwargs):
+        key = kwargs.pop('key', None)
+        super(ContactForm, self).__init__(*args, **kwargs)
+        self.key = key
+

     def save(self, request):
     def save(self, request):

+        key = self.key

         body = {}
         for name, value in self.cleaned_data.items():
         body = {}
         for name, value in self.cleaned_data.items():

-            if not isinstance(value, UploadedFile) and name != 'contact':
+            if not isinstance(value, UploadedFile) and name != 'contact' and not name.startswith('_'):

                     body[name] = value
                     body[name] = value

-        contact = Contact.objects.create(body=body,
+        save_as_tag = self.save_as_tag or self.form_tag
+        if key:
+            contact = Contact.objects.get(form_tag=save_as_tag, key=key)
+            contact.body = body
+            contact.ip = request.META['REMOTE_ADDR'] or '127.0.0.1'
+            contact.contact = self.cleaned_data['contact']
+            contact.save()
+        else:
+            contact = Contact.objects.create(body=body,

                     ip=request.META['REMOTE_ADDR'],
                     contact=self.cleaned_data['contact'],
                     ip=request.META['REMOTE_ADDR'],
                     contact=self.cleaned_data['contact'],

-                    form_tag=self.form_tag)
+                    form_tag=save_as_tag)

         for name, value in self.cleaned_data.items():
             if isinstance(value, UploadedFile):
         for name, value in self.cleaned_data.items():
             if isinstance(value, UploadedFile):

+                contact.attachment_set.filter(tag=name).delete()

                 attachment = Attachment(contact=contact, tag=name)
                 attachment.file.save(value.name, value)
                 attachment.save()
                 attachment = Attachment(contact=contact, tag=name)
                 attachment.file.save(value.name, value)
                 attachment.save()


@@ -50,12 +73,13 @@ class ContactForm(forms.Form):
             'site_name': site.name,
             'site_domain': site.domain,
             'contact': contact,
             'site_name': site.name,
             'site_domain': site.domain,
             'contact': contact,

+            'form': self,

         }
         context = RequestContext(request)
         mail_managers_subject = render_to_string([
                 'contact/%s/mail_managers_subject.txt' % self.form_tag,
                 'contact/mail_managers_subject.txt', 
         }
         context = RequestContext(request)
         mail_managers_subject = render_to_string([
                 'contact/%s/mail_managers_subject.txt' % self.form_tag,
                 'contact/mail_managers_subject.txt', 

-            ], dictionary, context)
+            ], dictionary, context).strip()

         mail_managers_body = render_to_string([
                 'contact/%s/mail_managers_body.txt' % self.form_tag,
                 'contact/mail_managers_body.txt', 
         mail_managers_body = render_to_string([
                 'contact/%s/mail_managers_body.txt' % self.form_tag,
                 'contact/mail_managers_body.txt', 


@@ -63,11 +87,15 @@ class ContactForm(forms.Form):
         mail_managers(mail_managers_subject, mail_managers_body, 
             fail_silently=True)
 
         mail_managers(mail_managers_subject, mail_managers_body, 
             fail_silently=True)
 

-        if email_re.match(contact.contact):
+        try:
+            validate_email(contact.contact)
+        except ValidationError:
+            pass
+        else:

             mail_subject = render_to_string([
                     'contact/%s/mail_subject.txt' % self.form_tag,
                     'contact/mail_subject.txt', 
             mail_subject = render_to_string([
                     'contact/%s/mail_subject.txt' % self.form_tag,
                     'contact/mail_subject.txt', 

-                ], dictionary, context)
+                ], dictionary, context).strip()

             mail_body = render_to_string([
                     'contact/%s/mail_body.txt' % self.form_tag,
                     'contact/mail_body.txt', 
             mail_body = render_to_string([
                     'contact/%s/mail_body.txt' % self.form_tag,
                     'contact/mail_body.txt',