From 46a89fe268971f936f21b89a75af39777dacb5bd Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 21 Mar 2019 17:23:16 +0100
Subject: [PATCH] Cleanup mails.views, solve circular import problem
---
journals/views.py | 6 +++---
mails/forms.py | 13 -------------
mails/urls.py | 2 --
mails/views.py | 18 +-----------------
4 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/journals/views.py b/journals/views.py
index 63a761a36..436a1ec1d 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -6,10 +6,9 @@ import hashlib
import json
import os
import random
-import requests
-import shutil
import string
-import xml.etree.ElementTree as ET
+import shutil
+import requests
from django.contrib.auth.decorators import login_required
@@ -46,6 +45,7 @@ from .utils import JournalUtils
from comments.models import Comment
from funders.forms import FunderSelectForm, GrantSelectForm
from funders.models import Grant
+from mails.views import MailEditorSubview
from ontology.models import Topic
from ontology.forms import SelectTopicForm
from organizations.models import Organization
diff --git a/mails/forms.py b/mails/forms.py
index 870918b17..702c2d806 100644
--- a/mails/forms.py
+++ b/mails/forms.py
@@ -73,19 +73,6 @@ class EmailForm(forms.Form):
return self.engine.template_variables['object']
-class FakeForm(forms.Form):
- """
- Fake form for testing purposes.
- """
-
- field1 = forms.CharField(label='Field 1')
-
- def save(self):
- """Dummy method."""
- print('Save', self.cleaned_data)
- return
-
-
class HiddenDataForm(forms.Form):
"""
Regular Django form which tranforms all fields to hidden fields.
diff --git a/mails/urls.py b/mails/urls.py
index d79388013..c11612ce8 100644
--- a/mails/urls.py
+++ b/mails/urls.py
@@ -7,6 +7,4 @@ from django.conf.urls import url
from . import views
urlpatterns = [
- url(r'^test/(?P<pk>\d+)/$', views.TestView.as_view(), name='test'),
- url(r'^test/(?P<pk>\d+)/edit$', views.TestUpdateView.as_view(), name='test_edit'),
]
diff --git a/mails/views.py b/mails/views.py
index 9e177b458..64f0c7535 100644
--- a/mails/views.py
+++ b/mails/views.py
@@ -9,8 +9,7 @@ from django.shortcuts import render
from django.utils.encoding import force_text
from django.views.generic.edit import UpdateView
-from submissions.models import Submission
-from .forms import EmailForm, HiddenDataForm, FakeForm
+from .forms import EmailForm, HiddenDataForm
class MailViewBase:
@@ -131,21 +130,6 @@ class MailView(MailViewBase, UpdateView):
return super().form_valid(form)
-class TestView(MailView):
- """To be removed; exists for testing purposes only."""
- mail_code = 'tests/test_mail_code_1'
- model = Submission
- success_url = '/'
-
-
-class TestUpdateView(MailFormView):
- """To be removed; exists for testing purposes only."""
- mail_code = 'tests/test_mail_code_1'
- model = Submission
- success_url = '/'
- form_class = FakeForm
-
-
class MailEditorSubview:
"""
This subview works as an interrupter for function based views.
--
GitLab