From 09c5c4dd851539a55bcb89fe4e4b622c5caf3f8c Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 1 Feb 2019 15:51:33 +0000
Subject: [PATCH] Updates to re-align with the tests
---
opentech/apply/funds/forms.py | 6 +++---
opentech/apply/funds/tests/views/__init__.py | 0
opentech/apply/funds/views.py | 2 +-
opentech/settings/test.py | 4 ++++
4 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 opentech/apply/funds/tests/views/__init__.py
diff --git a/opentech/apply/funds/forms.py b/opentech/apply/funds/forms.py
index 5e4e7de59..ee4be03fc 100644
--- a/opentech/apply/funds/forms.py
+++ b/opentech/apply/funds/forms.py
@@ -70,11 +70,11 @@ class UpdateReviewersForm(forms.ModelForm):
self.user = kwargs.pop('user')
super().__init__(*args, **kwargs)
reviewers = self.instance.reviewers.all()
- submitted_reviewers = User.objects.filter(id__in=self.instance.reviews.values('author'))
+ self.submitted_reviewers = User.objects.filter(id__in=self.instance.reviews.values('author'))
- self.prepare_field('staff_reviewers', reviewers, submitted_reviewers)
+ self.prepare_field('staff_reviewers', reviewers, self.submitted_reviewers)
if self.can_alter_external_reviewers(self.instance, self.user):
- self.prepare_field('reviewer_reviewers', reviewers, submitted_reviewers)
+ self.prepare_field('reviewer_reviewers', reviewers, self.submitted_reviewers)
else:
self.fields.pop('reviewer_reviewers')
diff --git a/opentech/apply/funds/tests/views/__init__.py b/opentech/apply/funds/tests/views/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 8b498fa78..f67dddeea 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -376,7 +376,7 @@ class SubmissionSealedView(DetailView):
return HttpResponseRedirect(reverse_lazy('funds:submissions:sealed', args=(submission.id,)))
-class ApplicantSubmissionDetailView(ActivityContextMixin, DelegateableView):
+class ApplicantSubmissionDetailView(ActivityContextMixin, DelegateableView, DetailView):
model = ApplicationSubmission
form_views = [CommentFormView]
diff --git a/opentech/settings/test.py b/opentech/settings/test.py
index e084affe8..11a71f78e 100644
--- a/opentech/settings/test.py
+++ b/opentech/settings/test.py
@@ -1,3 +1,7 @@
+import logging
+
+logging.disable(logging.CRITICAL)
+
from .base import * # noqa
# Should only include explicit testing settings
--
GitLab