diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py index 47423b4cdaf62aa4fc45a5c2653207e7b41a4262..9744ff26cf9802cae23d476b2862366ca3b6faed 100644 --- a/opentech/apply/funds/models/submissions.py +++ b/opentech/apply/funds/models/submissions.py @@ -34,7 +34,6 @@ from ..workflow import ( active_statuses, DETERMINATION_RESPONSE_PHASES, get_review_active_statuses, - get_edit_review_active_statuses, INITIAL_STATE, PHASES, review_statuses, @@ -103,8 +102,7 @@ class ApplicationSubmissionQueryset(JSONOrderable): return self.filter(reviews__author=user) def partner_for(self, user): - user_edit_review_statuses = get_edit_review_active_statuses(user) - return self.filter(partners=user, status__in=user_edit_review_statuses) + return self.filter(partners=user) def awaiting_determination_for(self, user): return self.filter(status__in=DETERMINATION_RESPONSE_PHASES).filter(lead=user) diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py index 1a99921ac153747696cb6b8281066cb8c059a3a3..2d8d39f1309f88461a1f7badeb0cbdb53b4fe5b6 100644 --- a/opentech/apply/funds/views.py +++ b/opentech/apply/funds/views.py @@ -55,7 +55,7 @@ from .tables import ( SubmissionReviewerFilterAndSearch, SummarySubmissionsTable, ) -from .workflow import STAGE_CHANGE_ACTIONS, PHASES_MAPPING, review_statuses, get_edit_review_active_statuses +from .workflow import STAGE_CHANGE_ACTIONS, PHASES_MAPPING, review_statuses class BaseAdminSubmissionsTable(SingleTableMixin, FilterView): @@ -492,8 +492,7 @@ class PartnerSubmissionDetailView(ReviewContextMixin, ActivityContextMixin, Dele return ApplicantSubmissionDetailView.as_view()(request, *args, **kwargs) # Only allow partners in the submission they are added as partners partner_has_access = submission.partners.filter(pk=request.user.pk).exists() - user_edit_review_statuses = get_edit_review_active_statuses(request.user) - if not partner_has_access or submission.status not in user_edit_review_statuses: + if not partner_has_access: raise PermissionDenied return super().dispatch(request, *args, **kwargs) diff --git a/opentech/apply/funds/workflow.py b/opentech/apply/funds/workflow.py index ee4ff092e2c3913e0881dcf49c6afb59b6838a28..50b4a27e796b7718d3a0c0a4830f3622422396c6 100644 --- a/opentech/apply/funds/workflow.py +++ b/opentech/apply/funds/workflow.py @@ -871,18 +871,6 @@ def get_review_active_statuses(user=None): return reviews -def get_edit_review_active_statuses(user=None): - statuses = set() - - for phase_name, phase in PHASES: - if phase_name in active_statuses: - if user is None: - statuses.add(phase_name) - elif phase.permissions.can_review(user) or phase.permissions.can_edit(user): - statuses.add(phase_name) - return statuses - - def get_review_statuses(user=None): reviews = set()