diff --git a/opentech/apply/funds/forms.py b/opentech/apply/funds/forms.py index e9c62fba4f0568f02f8f78b8e667547f7c365d0b..c5efce9d4225f6814f4bdac7ee0c25affb297d5d 100644 --- a/opentech/apply/funds/forms.py +++ b/opentech/apply/funds/forms.py @@ -1,5 +1,4 @@ from django import forms -from django_fsm import can_proceed from opentech.apply.users.models import User diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py index a43e4141e0522de12c02d751b73b12cdeb83d39c..35024c38fd34adea91313703ffe03e955d0e1827 100644 --- a/opentech/apply/funds/models.py +++ b/opentech/apply/funds/models.py @@ -1,5 +1,4 @@ from datetime import date -import copy import os from django.conf import settings @@ -789,7 +788,6 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss if isinstance(field.block, MustIncludeFieldBlock) } - def process_form_data(self): for field_name, field_id in self.must_include.items(): response = self.form_data.pop(field_id, None) diff --git a/opentech/apply/funds/tests/factories/models.py b/opentech/apply/funds/tests/factories/models.py index ed198f6c05cd80b6150633d9393b8cf741f8eb2c..183fb45fd8441fb79d90f0092cf7ebd476edb4f3 100644 --- a/opentech/apply/funds/tests/factories/models.py +++ b/opentech/apply/funds/tests/factories/models.py @@ -184,7 +184,7 @@ class FormDataFactory(factory.Factory, metaclass=Metaclass): for field in form_fields } else: - form_definition = { + form_definition = { f.block_type: f.id for f in form_fields or ApplicationSubmission.form_fields.field.to_python(form_fields) } diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py index 42a9561a9cf378e3b39d25b88437a87ef8217dbd..8eb11313fb8f99402a154b4f26662624163b2236 100644 --- a/opentech/apply/funds/views.py +++ b/opentech/apply/funds/views.py @@ -8,7 +8,6 @@ from django.utils.text import mark_safe from django.views.generic import DetailView, ListView, UpdateView from django_filters.views import FilterView -from django_fsm import can_proceed from django_tables2.views import SingleTableMixin from opentech.apply.activity.views import ( @@ -22,9 +21,7 @@ from opentech.apply.funds.workflow import DETERMINATION_RESPONSE_TRANSITIONS from opentech.apply.review.views import ReviewContextMixin from opentech.apply.users.decorators import staff_required from opentech.apply.utils.views import DelegateableView, ViewDispatcher -from opentech.apply.users.models import User -from .blocks import MustIncludeFieldBlock from .differ import compare from .forms import ProgressSubmissionForm, UpdateReviewersForm, UpdateSubmissionLeadForm from .models import ApplicationSubmission, ApplicationRevision @@ -253,7 +250,6 @@ class RevisionListView(ListView): self.queryset = self.model.objects.filter(submission=self.submission).exclude(id=self.submission.draft_revision.id) return super().get_queryset() - def get_context_data(self, **kwargs): return super().get_context_data( submission=self.submission,