From e7ad80e5f4c6a452b1d1020c6f8e538d20fd58a8 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Thu, 1 Mar 2018 20:24:00 +0000
Subject: [PATCH] Remove captcha
---
opentech/public/forms/models.py | 6 ++----
opentech/settings/base.py | 2 --
requirements.txt | 1 -
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opentech/public/forms/models.py b/opentech/public/forms/models.py
index d0876d54d..29a9d12be 100644
--- a/opentech/public/forms/models.py
+++ b/opentech/public/forms/models.py
@@ -7,11 +7,9 @@ from wagtail.admin.edit_handlers import (
FieldPanel, FieldRowPanel,
MultiFieldPanel, InlinePanel
)
-from wagtail.contrib.forms.models import AbstractFormField
+from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField
from wagtail.search import index
-from wagtailcaptcha.models import WagtailCaptchaEmailForm
-
from opentech.public.utils.models import BasePage
@@ -19,7 +17,7 @@ class FormField(AbstractFormField):
page = ParentalKey('FormPage', related_name='form_fields')
-class FormPage(WagtailCaptchaEmailForm, BasePage):
+class FormPage(AbstractEmailForm, BasePage):
subpage_types = []
introduction = models.TextField(blank=True)
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index 95c8d2c44..9fcce23ca 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -54,9 +54,7 @@ INSTALLED_APPS = [
'modelcluster',
'taggit',
'django_extensions',
- 'captcha',
'tinymce',
- 'wagtailcaptcha',
'django_tables2',
'django_filters',
'django_select2',
diff --git a/requirements.txt b/requirements.txt
index c360044d9..35f345223 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ django-countries==5.1
Werkzeug==0.11.11
stellar==0.4.3
django-tinymce4-lite==1.7.0
-wagtail-django-recaptcha==0.1
uwsgidecorators==1.1.0
mypy==0.550
--
GitLab