X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/820e41645dd2ed482850e260eab1f0ff138eb8b4..ba82ae80d1b6b98cd27a0acb374633eb01378149:/contact/forms.py?ds=sidebyside

diff --git a/contact/forms.py b/contact/forms.py
index 1195f02..419540a 100644
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -33,22 +33,38 @@ class ContactForm(forms.Form):
     form_title = _('Contact form')
     submit_label = _('Submit')
     admin_list = None
+    notify_on_register = True
+    notify_user = True
 
     required_css_class = 'required'
-    contact = forms.CharField(max_length=128)
+    contact = forms.EmailField(label=_('E-mail'), 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):
+        key = self.key
         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
         save_as_tag = self.save_as_tag or self.form_tag
-        contact = Contact.objects.create(body=body,
+        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'],
                     form_tag=save_as_tag)
         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()
@@ -62,33 +78,34 @@ class ContactForm(forms.Form):
             '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', 
-            ], dictionary, context)
-        mail_managers_body = render_to_string([
-                'contact/%s/mail_managers_body.txt' % self.form_tag,
-                'contact/mail_managers_body.txt', 
-            ], dictionary, context)
-        mail_managers(mail_managers_subject, mail_managers_body, 
-            fail_silently=True)
+        if self.notify_on_register:
+            mail_managers_subject = render_to_string([
+                    'contact/%s/mail_managers_subject.txt' % self.form_tag,
+                    'contact/mail_managers_subject.txt',
+                ], dictionary, context).strip()
+            mail_managers_body = render_to_string([
+                    'contact/%s/mail_managers_body.txt' % self.form_tag,
+                    'contact/mail_managers_body.txt',
+                ], dictionary, context)
+            mail_managers(mail_managers_subject, mail_managers_body, fail_silently=True)
 
         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', 
-                ], dictionary, context)
-            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)
+            if self.notify_user:
+                mail_subject = render_to_string([
+                        '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)
+                send_mail(mail_subject, mail_body,
+                    'no-reply@%s' % site.domain,
+                    [contact.contact],
+                    fail_silently=True)
 
         return contact