extract method for sending contact confirmation

diff --git a/contact/forms.py b/contact/forms.py
index 2cc6971..5e80c24 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -4,7 +4,7 @@ from datetime import datetime
 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.mail import mail_managers
 from django.core.validators import validate_email
 from django import forms
 from django.template.loader import render_to_string
@@ -141,7 +141,6 @@ class ContactForm(forms.Form):
                 attachment.file.save(value.name, value)
                 attachment.save()
 
-        site = Site.objects.get_current()
         dictionary = self.get_dictionary(contact)
         context = RequestContext(request)
         mail_managers_subject = render_to_string([
@@ -160,23 +159,7 @@ class ContactForm(forms.Form):
             pass
         else:
             if not self.instance:
-                mail_subject = render_to_string([
-                        'contact/%s/mail_subject.txt' % self.form_tag,
-                        'contact/mail_subject.txt',
-                    ], dictionary, context).strip()
-                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)
+                contact.send_confirmation(context=context, form=self)
             if email_changed and self.mailing_field and self.cleaned_data[self.mailing_field]:
                 mailing.subscribe(contact.contact)
 

diff --git a/contact/models.py b/contact/models.py
index be16c4c..7fe8f9c 100644 (file)
--- a/contact/models.py
+++ b/contact/models.py
@@ -31,13 +31,47 @@ class Contact(models.Model):
     def __unicode__(self):
         return unicode(self.created_at)
 
+    def get_form_class(self):
+        from contact.forms import contact_forms
+        return contact_forms.get(self.form_tag)
+
+    def get_update_form_class(self):
+        from contact.forms import update_forms
+        return update_forms.get(self.form_tag, self.get_form_class())
+
     @permalink
     def update_url(self):
-        from contact.forms import update_forms, contact_forms
-        form_class = update_forms.get(self.form_tag, contact_forms.get(self.form_tag))
+        form_class = self.get_update_form_class()
         confirmation = form_class.confirmation_class.objects.get(contact=self)
         return 'edit_form', [], {'form_tag': self.form_tag, 'contact_id': self.id, 'key': confirmation.key}
 
+    def send_confirmation(self, context=None, form=None):
+        from django.template.loader import render_to_string
+        from django.core.mail import send_mail
+        from django.contrib.sites.models import Site
+        if not form:
+            form_class = self.get_form_class()
+            form = form_class()
+        dictionary = form.get_dictionary(self)
+        mail_subject = render_to_string([
+            'contact/%s/mail_subject.txt' % self.form_tag,
+            'contact/mail_subject.txt',
+        ], dictionary, context).strip()
+        if form.result_page:
+            mail_body = render_to_string(
+                'contact/%s/results_email.txt' % self.form_tag,
+                {
+                    'contact': self,
+                    'results': form.results(self),
+                }, context)
+        else:
+            mail_body = render_to_string([
+                'contact/%s/mail_body.txt' % self.form_tag,
+                'contact/mail_body.txt',
+            ], dictionary, context)
+        site = Site.objects.get_current()
+        send_mail(mail_subject, mail_body, 'no-reply@%s' % site.domain, [self.contact], fail_silently=True)
+
 
 class Attachment(models.Model):
     contact = models.ForeignKey(Contact)