diff --git a/opentech/public/forms/models.py b/opentech/public/forms/models.py index d0876d54da311fb1d595051aad98ead977607d1f..29a9d12bea2d8f052374fe7a174aff4e34dc652d 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 95c8d2c44a881fc48ab4000f004d30cce80356eb..9fcce23ca2600b85d825cb3d133b3f413e331e0b 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 c360044d9bb545eb6b08bf0cae491efb41ea110a..35f3452236e640697235f8df4984c64f38b19e4d 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