From d0b543b6d3fa445ec0818618f100fcd79a38c29e Mon Sep 17 00:00:00 2001
From: Dan Braghis <dan.braghis@torchbox.com>
Date: Fri, 22 Jun 2018 10:44:00 +0100
Subject: [PATCH] Revert progress_stage change.
Depends on revisions PR
---
opentech/apply/determinations/views.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/opentech/apply/determinations/views.py b/opentech/apply/determinations/views.py
index 1ddde512d..2df3255cd 100644
--- a/opentech/apply/determinations/views.py
+++ b/opentech/apply/determinations/views.py
@@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
from django.views.generic import DetailView
+from django_fsm import can_proceed
from opentech.apply.funds.models import ApplicationSubmission
from opentech.apply.utils.views import CreateOrUpdateView
@@ -82,11 +83,12 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
return self.progress_stage(self.submission) or response
def progress_stage(self, instance):
- try:
- instance.perform_transition('draft_proposal', self.request.user)
- except PermissionDenied:
- pass
- else:
+ # TODO update post-revisions work
+ proposal_transition = instance.get_transition('draft_proposal')
+ if proposal_transition:
+ if can_proceed(proposal_transition):
+ proposal_transition(by=self.request.user)
+ instance.save()
return HttpResponseRedirect(instance.get_absolute_url())
def get_action_name_from_determination(self, determination):
--
GitLab