diff --git a/opentech/apply/determinations/tests/test_views.py b/opentech/apply/determinations/tests/test_views.py
index b5d8f49823dc05300e77ebbc06123f79a183ff9d..8da50290d1d0a428b2ec239de2d83c92517e2c90 100644
--- a/opentech/apply/determinations/tests/test_views.py
+++ b/opentech/apply/determinations/tests/test_views.py
@@ -24,7 +24,6 @@ class StaffDeterminationsTestCase(BaseViewTestCase):
self.assertContains(response, determination.submission.title)
self.assertContains(response, self.user.full_name)
self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': submission.id}))
- self.assertFalse(response.context['can_view_extended_data'])
def test_lead_can_access_determination(self):
submission = ApplicationSubmissionFactory(status='in_discussion', lead=self.user)
@@ -33,7 +32,6 @@ class StaffDeterminationsTestCase(BaseViewTestCase):
self.assertContains(response, determination.submission.title)
self.assertContains(response, self.user.full_name)
self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': submission.id}))
- self.assertTrue(response.context['can_view_extended_data'])
class DeterminationFormTestCase(BaseViewTestCase):
@@ -50,13 +48,8 @@ class DeterminationFormTestCase(BaseViewTestCase):
self.assertContains(response, submission.title)
self.assertContains(response, reverse('funds:submissions:detail', kwargs={'pk': submission.id}))
- def test_cannot_access_form_if_not_lead(self):
- submission = ApplicationSubmissionFactory(status='in_discussion')
- response = self.get_page(submission, 'form')
- self.assertEqual(response.status_code, 403)
-
def test_cant_access_wrong_status(self):
- submission = ApplicationSubmissionFactory()
+ submission = ApplicationSubmissionFactory(status='more_info')
response = self.get_page(submission, 'form')
self.assertEqual(response.status_code, 403)
@@ -64,8 +57,7 @@ class DeterminationFormTestCase(BaseViewTestCase):
submission = ApplicationSubmissionFactory(status='in_discussion', lead=self.user)
determination = DeterminationFactory(submission=submission, author=self.user, submitted=True)
response = self.post_page(submission, {'data': 'value', 'outcome': determination.outcome}, 'form')
- self.assertTrue(response.context['has_determination_response'])
- self.assertContains(response, 'You have already added a determination for this submission')
+ self.assertRedirects(response, self.url(submission))
def test_can_edit_draft_determination(self):
submission = ApplicationSubmissionFactory(status='post_review_discussion', lead=self.user)
@@ -82,9 +74,9 @@ class DeterminationFormTestCase(BaseViewTestCase):
def test_cannot_edit_draft_determination_if_not_lead(self):
submission = ApplicationSubmissionFactory(status='in_discussion')
- determination = DeterminationFactory(submission=submission, author=self.user)
+ determination = DeterminationFactory(submission=submission, author=self.user, accepted=True)
response = self.post_page(submission, {'data': 'value', 'outcome': determination.outcome}, 'form')
- self.assertEqual(response.status_code, 403)
+ self.assertRedirects(response, self.url(submission))
def test_sends_message_if_requires_more_info(self):
submission = ApplicationSubmissionFactory(status='in_discussion', lead=self.user)
diff --git a/opentech/apply/determinations/views.py b/opentech/apply/determinations/views.py
index 7cb8fb4a6b877c12acc936f1033aa2527c4f69b4..f1c25ac2249b698991e1520fa91d53de63e1a15f 100644
--- a/opentech/apply/determinations/views.py
+++ b/opentech/apply/determinations/views.py
@@ -1,9 +1,11 @@
+from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
+from django.utils.translation import ugettext_lazy as _
from django.views.generic import DetailView
from opentech.apply.activity.models import Activity
@@ -23,8 +25,30 @@ def get_form_for_stage(submission):
return forms[index]
+def determination_actions(user, submission):
+ return [action[0] for action in submission.get_actions_for_user(user)]
+
+
+def transition_from_outcome(outcome, submission):
+ for transition_name in submission.phase.transitions:
+ try:
+ transition_type = TRANSITION_DETERMINATION[transition_name]
+ except KeyError:
+ pass
+ else:
+ if transition_type == outcome:
+ return transition_name
+
+
+def can_edit_determination(user, determination, submission):
+ outcome = transition_from_outcome(determination.outcome, submission)
+ valid_outcomes = determination_actions(user, submission)
+ return outcome in valid_outcomes and determination.is_draft
+
+
def can_create_determination(user, submission):
- return any(action[0] in DETERMINATION_OUTCOMES for action in submission.get_actions_for_user(user))
+ actions = determination_actions(user, submission)
+ return any(action in DETERMINATION_OUTCOMES for action in actions)
@method_decorator(staff_required, name='dispatch')
@@ -42,16 +66,26 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
raise PermissionDenied()
if self.submission.has_determination:
+ messages.warning(request, _('A determination has already been submitted for that submission.'))
return HttpResponseRedirect(reverse_lazy('apply:submissions:determinations:detail', args=(self.submission.id,)))
+ try:
+ determination = self.get_object()
+ except Determination.DoesNotExist:
+ pass
+ else:
+ if not can_edit_determination(request.user, determination, self.submission):
+ messages.warning(request, _('There is a draft determination you do not have permission to edit.'))
+ return HttpResponseRedirect(reverse_lazy('apply:submissions:determinations:detail', args=(self.submission.id,)))
+
return super().dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs):
- messages = DeterminationMessageSettings.for_site(self.request.site)
+ determination_messages = DeterminationMessageSettings.for_site(self.request.site)
return super().get_context_data(
submission=self.submission,
- message_templates=messages.get_for_stage(self.submission.stage.name),
+ message_templates=determination_messages.get_for_stage(self.submission.stage.name),
**kwargs
)
@@ -78,7 +112,7 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
user=self.object.author,
submission=self.object.submission,
)
- transition = self.transition_from_outcome(int(form.cleaned_data.get('outcome')))
+ transition = transition_from_outcome(int(form.cleaned_data.get('outcome')), self.submission)
if self.object.outcome == NEEDS_MORE_INFO:
# We keep a record of the message sent to the user in the comment
@@ -106,16 +140,6 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
)
return HttpResponseRedirect(instance.get_absolute_url())
- def transition_from_outcome(self, outcome):
- for transition_name in self.submission.phase.transitions:
- try:
- transition_type = TRANSITION_DETERMINATION[transition_name]
- except KeyError:
- pass
- else:
- if transition_type == outcome:
- return transition_name
-
@method_decorator(staff_required, name='dispatch')
class AdminDeterminationDetailView(DetailView):
@@ -128,7 +152,7 @@ class AdminDeterminationDetailView(DetailView):
self.submission = get_object_or_404(ApplicationSubmission, id=self.kwargs['submission_pk'])
determination = self.get_object()
- if determination.is_draft and can_create_determination(request.user, self.submission):
+ if can_edit_determination(request.user, determination, self.submission):
return HttpResponseRedirect(reverse_lazy('apply:submissions:determinations:form', args=(self.submission.id,)))
return super().dispatch(request, *args, **kwargs)
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index d42ee90938eba197ed0f6c395ffb196d4b2c3e3d..779f551c64b28956b975dfca4cbf5ffe5c749b49 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -30,7 +30,6 @@ from .utils import LIMIT_TO_STAFF, LIMIT_TO_STAFF_AND_REVIEWERS, WorkflowHelpers
from ..blocks import ApplicationCustomFormFieldsBlock, REQUIRED_BLOCK_NAMES
from ..workflow import (
active_statuses,
- DETERMINATION_PHASES,
DETERMINATION_RESPONSE_PHASES,
get_review_statuses,
INITIAL_STATE,