From 549be954d645c54d79c4bcb0fe1fb30da085d389 Mon Sep 17 00:00:00 2001
From: Parbhat Puri <parbhatpuri17@gmail.com>
Date: Tue, 23 Apr 2019 07:25:44 +0000
Subject: [PATCH] GH-1147: Partner can edit whenever applicant can in addition
to ac review phase
---
opentech/apply/funds/models/submissions.py | 4 ++--
opentech/apply/funds/workflow.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 4eaf78a92..47423b4cd 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -34,7 +34,7 @@ from ..workflow import (
active_statuses,
DETERMINATION_RESPONSE_PHASES,
get_review_active_statuses,
- get_edit_or_review_active_statuses,
+ get_edit_review_active_statuses,
INITIAL_STATE,
PHASES,
review_statuses,
@@ -103,7 +103,7 @@ class ApplicationSubmissionQueryset(JSONOrderable):
return self.filter(reviews__author=user)
def partner_for(self, user):
- user_edit_review_statuses = get_edit_or_review_active_statuses(user)
+ user_edit_review_statuses = get_edit_review_active_statuses(user)
return self.filter(partners=user, status__in=user_edit_review_statuses)
def awaiting_determination_for(self, user):
diff --git a/opentech/apply/funds/workflow.py b/opentech/apply/funds/workflow.py
index ece64e35a..ee4ff092e 100644
--- a/opentech/apply/funds/workflow.py
+++ b/opentech/apply/funds/workflow.py
@@ -166,7 +166,7 @@ reviewer_review_permissions = make_permissions(edit=[staff_can, partner_can], re
community_review_permissions = make_permissions(edit=[staff_can], review=[staff_can, reviewer_can, community_can])
-applicant_edit_permissions = make_permissions(edit=[applicant_can], review=[staff_can])
+applicant_edit_permissions = make_permissions(edit=[applicant_can, partner_can], review=[staff_can])
staff_applicant_edit_permissions = make_permissions(edit=[staff_can, applicant_can])
@@ -871,7 +871,7 @@ def get_review_active_statuses(user=None):
return reviews
-def get_edit_or_review_active_statuses(user=None):
+def get_edit_review_active_statuses(user=None):
statuses = set()
for phase_name, phase in PHASES:
--
GitLab