From ec8fa04dcbb535de8fc34f4021d7ce2182e949b6 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Sun, 1 Sep 2019 22:35:31 +0200
Subject: [PATCH] Use only default contact form for now. Advances #44.
---
biscuit/core/forms.py | 8 --------
biscuit/core/menus.py | 2 +-
.../contact_form/{support => }/contact_form.html | 0
.../contact_form/{support/body.txt => contact_form.txt} | 0
.../contact_form/{sent.html => contact_form_sent.html} | 0
.../{support/subject.txt => contact_form_subject.txt} | 0
biscuit/core/urls.py | 9 +--------
7 files changed, 2 insertions(+), 17 deletions(-)
rename biscuit/core/templates/contact_form/{support => }/contact_form.html (100%)
rename biscuit/core/templates/contact_form/{support/body.txt => contact_form.txt} (100%)
rename biscuit/core/templates/contact_form/{sent.html => contact_form_sent.html} (100%)
rename biscuit/core/templates/contact_form/{support/subject.txt => contact_form_subject.txt} (100%)
diff --git a/biscuit/core/forms.py b/biscuit/core/forms.py
index 4605dd42c..f6334c279 100644
--- a/biscuit/core/forms.py
+++ b/biscuit/core/forms.py
@@ -2,8 +2,6 @@ from django import forms
from django.contrib.auth import get_user_model
from django.utils.translation import ugettext_lazy as _
-from contact_form.forms import ContactForm
-
from .models import Person, Group
@@ -75,9 +73,3 @@ class EditGroupForm(forms.ModelForm):
super().__init__(*args, **kwargs)
self.fields['members'].queryset = Person.objects.all()
self.fields['owners'].queryset = Person.objects.all()
-
-
-class SupportContactForm(ContactForm):
- subject_template_name = 'contact_form/support/subject.txt'
- template_name = 'contact_form/support/body.txt'
-
\ No newline at end of file
diff --git a/biscuit/core/menus.py b/biscuit/core/menus.py
index 6e1e616ce..a8914a5a9 100644
--- a/biscuit/core/menus.py
+++ b/biscuit/core/menus.py
@@ -75,7 +75,7 @@ MENUS = {
'submenu': [
{
'name': _('Get support'),
- 'url': 'support_contact_form'
+ 'url': 'contact_form'
}
]
}
diff --git a/biscuit/core/templates/contact_form/support/contact_form.html b/biscuit/core/templates/contact_form/contact_form.html
similarity index 100%
rename from biscuit/core/templates/contact_form/support/contact_form.html
rename to biscuit/core/templates/contact_form/contact_form.html
diff --git a/biscuit/core/templates/contact_form/support/body.txt b/biscuit/core/templates/contact_form/contact_form.txt
similarity index 100%
rename from biscuit/core/templates/contact_form/support/body.txt
rename to biscuit/core/templates/contact_form/contact_form.txt
diff --git a/biscuit/core/templates/contact_form/sent.html b/biscuit/core/templates/contact_form/contact_form_sent.html
similarity index 100%
rename from biscuit/core/templates/contact_form/sent.html
rename to biscuit/core/templates/contact_form/contact_form_sent.html
diff --git a/biscuit/core/templates/contact_form/support/subject.txt b/biscuit/core/templates/contact_form/contact_form_subject.txt
similarity index 100%
rename from biscuit/core/templates/contact_form/support/subject.txt
rename to biscuit/core/templates/contact_form/contact_form_subject.txt
diff --git a/biscuit/core/urls.py b/biscuit/core/urls.py
index 4bdb15891..4e7d3ac62 100644
--- a/biscuit/core/urls.py
+++ b/biscuit/core/urls.py
@@ -3,14 +3,10 @@ from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
from django.urls import include, path
-from django.views.generic import TemplateView
-
-from contact_form.views import ContactFormView
import debug_toolbar
from . import views
-from .forms import SupportContactForm
urlpatterns = [
path('admin/', admin.site.urls),
@@ -30,10 +26,7 @@ urlpatterns = [
path('group/<int:id_>/edit', views.edit_group, name='edit_group_by_id'),
path('', views.index, name='index'),
path('maintenance-mode/', include('maintenance_mode.urls')),
- path('contact/support/', ContactFormView.as_view(form_class=SupportContactForm),
- name='support_contact_form'),
- path('contact/sent/', TemplateView.as_view(template_name='contact_form/sent.html'),
- name='contact_form_sent'),
+ path('contact/', include('contact_form.urls')),
path('__i18n__/', include('django.conf.urls.i18n'))
]
--
GitLab