From f33e15fd7cde08a427b353b68b9ec5e338ff1d6b Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Fri, 22 Feb 2019 10:52:58 +0000
Subject: [PATCH] GH-961: fixup from rebase
---
opentech/apply/review/tests/test_views.py | 2 +-
opentech/apply/review/views.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/review/tests/test_views.py b/opentech/apply/review/tests/test_views.py
index de44234c0..7a702a758 100644
--- a/opentech/apply/review/tests/test_views.py
+++ b/opentech/apply/review/tests/test_views.py
@@ -264,7 +264,7 @@ class StaffReviewOpinionCase(BaseViewTestCase):
staff = StaffFactory()
review = ReviewFactory(submission=self.submission, author=staff, recommendation_yes=True)
response = self.post_page(review, {'agree': AGREE})
- self.assertTrue('agrees' in Activity.objects.first().message)
+ self.assertTrue(review.opinions.first().opinion_display in Activity.objects.first().message)
self.assertEqual(ReviewOpinion.objects.all().count(), 1)
self.assertEqual(ReviewOpinion.objects.first().opinion, AGREE)
url = self.url_from_pattern('apply:submissions:reviews:review', kwargs={'submission_pk': self.submission.pk, 'pk': review.id})
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index 91e585e72..5f7e26c07 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -202,7 +202,7 @@ class ReviewOpinionFormView(CreateView):
related=opinion,
)
- if opinion == DISAGREE:
+ if opinion.opinion == DISAGREE:
return HttpResponseRedirect(reverse('apply:submissions:reviews:form', args=(self.review.submission.pk,)))
else:
return response
--
GitLab