Merge pull request #184 from springload/fix/submission-email-links

Fix some unexpected issues with the form submission emails

Author: haydngreatnews

core/models.py

@@ -7,6 +7,7 @@
 from modelcluster.tags import ClusterTaggableManager
 from taggit.models import Tag, TaggedItemBase
 from wagtailcaptcha.models import WagtailCaptchaEmailForm
+from wagtailcaptcha.forms import remove_captcha_field
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -549,6 +550,9 @@ class Meta:
     def process_form_submission(self, form):
         # Reproduce EmailFormMixin, but passing the submission to send_mail
         submission = AbstractForm.process_form_submission(self, form)
+        # this is part of the recaptcha field, but we skip
+        # it cos of using AbstractForm directly
+        remove_captcha_field(form)
         if self.to_address:
             self.send_mail(form, submission=submission)
         return submission
@@ -573,7 +577,7 @@ def render_email(self, form, submission=None):
             url = self.get_site().root_url + path
             body += textwrap.dedent(
                 f"""
-                <a href="{url}?pk={submission.id}">Submission {submission.id}</a>
+                Submission: {url}?pk={submission.id}
                 """
             )
         return body

madewithwagtail/settings/dev.py

@@ -45,10 +45,8 @@
 ALLOWED_HOSTS = ["*"]
 
 CACHE_MIDDLEWARE_SECONDS = 0
-# Change these if you want to enable recaptcha on submissions form
-# https://github.com/springload/wagtail-django-recaptcha
-RECAPTCHA_PUBLIC_KEY = ""
-RECAPTCHA_PRIVATE_KEY = ""
+
+# Disable captcha (if configured otherwise)
 NOCAPTCHA = False