diff --git a/journals/views.py b/journals/views.py index 63a761a36459cd3459f43dd30135da4a1a1887d5..436a1ec1d9fdb43ee418d63cfda5251a8d8b11fe 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 870918b178e5bbe9e8f8ab30ec0be4185b61ea88..702c2d80653a82730a16158545e1f58b683d702c 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 d79388013a145bf2b241dcab055143124375f2ff..c11612ce8550999fcb6e5d0933957f46bfdc5994 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 9e177b45830f5ca2a027b9d11e423047deee3ef1..64f0c7535738c6e5d92454184bd2644b8b2fcb07 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.