From a70547494876029d3da94675c09dcdcb765f589b Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 17 Jan 2018 10:08:20 +0000
Subject: [PATCH] Enable overwritting of django tempalte forms and update apps
 to not clash

---
 opentech/public/forms/__init__.py                           | 1 +
 opentech/public/forms/apps.py                               | 6 ++++++
 .../public/forms/migrations/0002_formpage_header_image.py   | 2 +-
 opentech/settings/base.py                                   | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 opentech/public/forms/apps.py

diff --git a/opentech/public/forms/__init__.py b/opentech/public/forms/__init__.py
index e69de29bb..bb2741c81 100644
--- a/opentech/public/forms/__init__.py
+++ b/opentech/public/forms/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'opentech.public.forms.apps.FormsConfig'
diff --git a/opentech/public/forms/apps.py b/opentech/public/forms/apps.py
new file mode 100644
index 000000000..71dfe9124
--- /dev/null
+++ b/opentech/public/forms/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class FormsConfig(AppConfig):
+    name = 'opentech.public.forms'
+    label = 'public_forms'
diff --git a/opentech/public/forms/migrations/0002_formpage_header_image.py b/opentech/public/forms/migrations/0002_formpage_header_image.py
index 2bd9e0202..3ce1bf394 100644
--- a/opentech/public/forms/migrations/0002_formpage_header_image.py
+++ b/opentech/public/forms/migrations/0002_formpage_header_image.py
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('images', '0001_initial'),
-        ('forms', '0001_initial'),
+        ('public_forms', '0001_initial'),
     ]
 
     operations = [
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index ced6888bc..22546b424 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -60,6 +60,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.sitemaps',
+    'django.forms',
 ]
 
 MIDDLEWARE = [
@@ -98,6 +99,8 @@ TEMPLATES = [
     },
 ]
 
+FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
+
 WSGI_APPLICATION = 'opentech.wsgi.application'
 
 
-- 
GitLab