Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
549be954
Commit
549be954
authored
5 years ago
by
Parbhat Puri
Browse files
Options
Downloads
Patches
Plain Diff
GH-1147: Partner can edit whenever applicant can in addition to ac review phase
parent
93d81946
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
opentech/apply/funds/models/submissions.py
+2
-2
2 additions, 2 deletions
opentech/apply/funds/models/submissions.py
opentech/apply/funds/workflow.py
+2
-2
2 additions, 2 deletions
opentech/apply/funds/workflow.py
with
4 additions
and
4 deletions
opentech/apply/funds/models/submissions.py
+
2
−
2
View file @
549be954
...
@@ -34,7 +34,7 @@ from ..workflow import (
...
@@ -34,7 +34,7 @@ from ..workflow import (
active_statuses
,
active_statuses
,
DETERMINATION_RESPONSE_PHASES
,
DETERMINATION_RESPONSE_PHASES
,
get_review_active_statuses
,
get_review_active_statuses
,
get_edit_
or_
review_active_statuses
,
get_edit_review_active_statuses
,
INITIAL_STATE
,
INITIAL_STATE
,
PHASES
,
PHASES
,
review_statuses
,
review_statuses
,
...
@@ -103,7 +103,7 @@ class ApplicationSubmissionQueryset(JSONOrderable):
...
@@ -103,7 +103,7 @@ class ApplicationSubmissionQueryset(JSONOrderable):
return
self
.
filter
(
reviews__author
=
user
)
return
self
.
filter
(
reviews__author
=
user
)
def
partner_for
(
self
,
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
)
return
self
.
filter
(
partners
=
user
,
status__in
=
user_edit_review_statuses
)
def
awaiting_determination_for
(
self
,
user
):
def
awaiting_determination_for
(
self
,
user
):
...
...
This diff is collapsed.
Click to expand it.
opentech/apply/funds/workflow.py
+
2
−
2
View file @
549be954
...
@@ -166,7 +166,7 @@ reviewer_review_permissions = make_permissions(edit=[staff_can, partner_can], re
...
@@ -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
])
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
])
staff_applicant_edit_permissions
=
make_permissions
(
edit
=
[
staff_can
,
applicant_can
])
...
@@ -871,7 +871,7 @@ def get_review_active_statuses(user=None):
...
@@ -871,7 +871,7 @@ def get_review_active_statuses(user=None):
return
reviews
return
reviews
def
get_edit_
or_
review_active_statuses
(
user
=
None
):
def
get_edit_review_active_statuses
(
user
=
None
):
statuses
=
set
()
statuses
=
set
()
for
phase_name
,
phase
in
PHASES
:
for
phase_name
,
phase
in
PHASES
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment