diff --git a/hypha/apply/funds/workflow.py b/hypha/apply/funds/workflow.py index 97e4267f8e..3a156c7af5 100644 --- a/hypha/apply/funds/workflow.py +++ b/hypha/apply/funds/workflow.py @@ -265,6 +265,7 @@ def make_permissions(edit=None, review=None, view=None): "almost": _("Accept but additional info required"), "accepted": _("Accept"), "rejected": _("Dismiss"), + "withdrawn": _("Withdraw"), }, "display": _("Need screening"), "public": _("Application Received"), @@ -287,6 +288,7 @@ def make_permissions(edit=None, review=None, view=None): "almost": _("Accept but additional info required"), "accepted": _("Accept"), "rejected": _("Dismiss"), + "withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Request, @@ -298,6 +300,7 @@ def make_permissions(edit=None, review=None, view=None): "transitions": { "post_review_discussion": _("Close Review"), INITIAL_STATE: _("Need screening (revert)"), + "withdrawn": _("Withdraw"), }, "display": _("Internal Review"), "public": _("{org_short_name} Review").format( @@ -316,6 +319,7 @@ def make_permissions(edit=None, review=None, view=None): "almost": _("Accept but additional info required"), "accepted": _("Accept"), "rejected": _("Dismiss"), + "withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": Request, @@ -337,6 +341,7 @@ def make_permissions(edit=None, review=None, view=None): "almost": _("Accept but additional info required"), "accepted": _("Accept"), "rejected": _("Dismiss"), + "withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Request, @@ -350,6 +355,7 @@ def make_permissions(edit=None, review=None, view=None): "almost": _("Accept but additional info required"), "accepted": _("Accept"), "rejected": _("Dismiss"), + "withdrawn": _("Withdraw"), }, "display": _("Ready for Determination"), "permissions": hidden_from_applicant_permissions, @@ -367,6 +373,7 @@ def make_permissions(edit=None, review=None, view=None): "transitions": { "accepted": _("Accept"), "post_review_discussion": _("Ready For Discussion (revert)"), + "withdrawn": _("Withdraw"), }, "display": _("Accepted but additional info required"), "stage": Request, @@ -377,6 +384,11 @@ def make_permissions(edit=None, review=None, view=None): "stage": Request, "permissions": no_permissions, }, + "withdrawn": { + "display": _("Withdrawn"), + "stage": Request, + "permissions": staff_edit_permissions, + }, }, ] @@ -402,7 +414,7 @@ def make_permissions(edit=None, review=None, view=None): "ext_internal_review": _("Open Review"), "ext_determination": _("Ready For Determination"), "ext_rejected": _("Dismiss"), - "ext_screening_withdrawn": _("Withdraw"), + "ext_withdrawn": _("Withdraw"), }, "display": _("Need screening"), "public": _("Application Received"), @@ -421,13 +433,13 @@ def make_permissions(edit=None, review=None, view=None): }, "method": "create_revision", }, - "ext_screening_withdrawn": _("Withdraw"), + "ext_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": RequestExt, "permissions": applicant_edit_permissions, }, - "ext_screening_withdrawn": { + "ext_withdrawn": { "display": _("Withdrawn"), "stage": RequestExt, "permissions": staff_edit_permissions, @@ -437,7 +449,7 @@ def make_permissions(edit=None, review=None, view=None): "ext_internal_review": { "transitions": { "ext_post_review_discussion": _("Close Review"), - "ext_review_withdrawn": _("Withdraw"), + "ext_withdrawn": _("Withdraw"), INITIAL_STATE: _("Need screening (revert)"), }, "display": _("Internal Review"), @@ -456,6 +468,7 @@ def make_permissions(edit=None, review=None, view=None): "ext_determination": _("Ready For Determination"), "ext_internal_review": _("Open Internal Review (revert)"), "ext_rejected": _("Dismiss"), + "ext_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": RequestExt, @@ -473,7 +486,7 @@ def make_permissions(edit=None, review=None, view=None): }, "method": "create_revision", }, - "ext_review_withdrawn": _("Withdraw"), + "ext_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": RequestExt, @@ -490,11 +503,6 @@ def make_permissions(edit=None, review=None, view=None): "stage": RequestExt, "permissions": reviewer_review_permissions, }, - "ext_review_withdrawn": { - "display": _("Withdrawn"), - "stage": RequestExt, - "permissions": staff_edit_permissions, - }, }, { "ext_post_external_review_discussion": { @@ -505,7 +513,7 @@ def make_permissions(edit=None, review=None, view=None): "ext_almost": _("Accept but additional info required"), "ext_accepted": _("Accept"), "ext_rejected": _("Dismiss"), - "ext_external_review_withdrawn": _("Withdraw"), + "ext_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": RequestExt, @@ -523,17 +531,12 @@ def make_permissions(edit=None, review=None, view=None): }, "method": "create_revision", }, - "ext_external_review_withdrawn": _("Withdraw"), + "ext_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": RequestExt, "permissions": applicant_edit_permissions, }, - "ext_external_review_withdrawn": { - "display": _("Withdrawn"), - "stage": RequestExt, - "permissions": staff_edit_permissions, - }, }, { "ext_determination": { @@ -564,6 +567,7 @@ def make_permissions(edit=None, review=None, view=None): "ext_post_external_review_discussion": _( "Ready For Discussion (revert)" ), + "ext_withdrawn": _("Withdraw"), }, "display": _("Accepted but additional info required"), "stage": RequestExt, @@ -607,6 +611,7 @@ def make_permissions(edit=None, review=None, view=None): "com_community_review": _("Open Community Review"), "com_determination": _("Ready For Determination"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": _("Need screening"), "public": _("Application Received"), @@ -634,6 +639,7 @@ def make_permissions(edit=None, review=None, view=None): "transitions": { INITIAL_STATE: _("Need screening (revert)"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": "Open Call (public)", "stage": RequestCom, @@ -647,6 +653,7 @@ def make_permissions(edit=None, review=None, view=None): "com_post_review_discussion": _("Close Review"), INITIAL_STATE: _("Need screening (revert)"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": _("Internal Review"), "public": _("{org_short_name} Review").format( @@ -660,6 +667,7 @@ def make_permissions(edit=None, review=None, view=None): "com_post_review_discussion": _("Close Review"), "com_internal_review": _("Open Internal Review (revert)"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": _("Community Review"), "public": _("{org_short_name} Review").format( @@ -677,6 +685,7 @@ def make_permissions(edit=None, review=None, view=None): "com_determination": _("Ready For Determination"), "com_internal_review": _("Open Internal Review (revert)"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": RequestCom, @@ -694,6 +703,7 @@ def make_permissions(edit=None, review=None, view=None): }, "method": "create_revision", }, + "com_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": RequestCom, @@ -705,6 +715,7 @@ def make_permissions(edit=None, review=None, view=None): "transitions": { "com_post_external_review_discussion": _("Close Review"), "com_post_review_discussion": _("Ready For Discussion (revert)"), + "com_withdrawn": _("Withdraw"), }, "display": _("External Review"), "stage": RequestCom, @@ -720,6 +731,7 @@ def make_permissions(edit=None, review=None, view=None): "com_almost": _("Accept but additional info required"), "com_accepted": _("Accept"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": RequestCom, @@ -737,6 +749,7 @@ def make_permissions(edit=None, review=None, view=None): }, "method": "create_revision", }, + "com_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": RequestCom, @@ -752,6 +765,7 @@ def make_permissions(edit=None, review=None, view=None): "com_almost": _("Accept but additional info required"), "com_accepted": _("Accept"), "com_rejected": _("Dismiss"), + "com_withdrawn": _("Withdraw"), }, "display": _("Ready for Determination"), "permissions": hidden_from_applicant_permissions, @@ -771,6 +785,7 @@ def make_permissions(edit=None, review=None, view=None): "com_post_external_review_discussion": _( "Ready For Discussion (revert)" ), + "com_withdrawn": _("Withdraw"), }, "display": _("Accepted but additional info required"), "stage": RequestCom, @@ -781,6 +796,11 @@ def make_permissions(edit=None, review=None, view=None): "stage": RequestCom, "permissions": no_permissions, }, + "com_withdrawn": { + "display": _("Withdrawn"), + "stage": RequestCom, + "permissions": staff_edit_permissions, + }, }, ] @@ -808,6 +828,7 @@ def make_permissions(edit=None, review=None, view=None): "concept_determination": _("Ready For Preliminary Determination"), "invited_to_proposal": _("Invite to Proposal"), "concept_rejected": _("Dismiss"), + "concept_withdrawn": _("Withdraw"), }, "display": _("Need screening"), "public": _("Concept Note Received"), @@ -829,6 +850,7 @@ def make_permissions(edit=None, review=None, view=None): "concept_rejected": _("Dismiss"), "invited_to_proposal": _("Invite to Proposal"), "concept_determination": _("Ready For Preliminary Determination"), + "concept_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Concept, @@ -841,6 +863,7 @@ def make_permissions(edit=None, review=None, view=None): "concept_review_discussion": _("Close Review"), INITIAL_STATE: _("Need screening (revert)"), "invited_to_proposal": _("Invite to Proposal"), + "concept_withdrawn": _("Withdraw"), }, "display": _("Internal Review"), "public": _("{org_short_name} Review").format( @@ -858,6 +881,7 @@ def make_permissions(edit=None, review=None, view=None): "concept_internal_review": _("Open Review (revert)"), "invited_to_proposal": _("Invite to Proposal"), "concept_rejected": _("Dismiss"), + "concept_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": Concept, @@ -876,6 +900,7 @@ def make_permissions(edit=None, review=None, view=None): "method": "create_revision", }, "invited_to_proposal": _("Invite to Proposal"), + "concept_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Concept, @@ -888,6 +913,7 @@ def make_permissions(edit=None, review=None, view=None): "concept_review_discussion": _("Ready For Discussion (revert)"), "invited_to_proposal": _("Invite to Proposal"), "concept_rejected": _("Dismiss"), + "concept_withdrawn": _("Withdraw"), }, "display": _("Ready for Preliminary Determination"), "permissions": hidden_from_applicant_permissions, @@ -918,6 +944,11 @@ def make_permissions(edit=None, review=None, view=None): "stage": Concept, "permissions": no_permissions, }, + "concept_withdrawn": { + "display": _("Withdrawn"), + "stage": Concept, + "permissions": staff_edit_permissions, + }, }, { "draft_proposal": { @@ -944,6 +975,7 @@ def make_permissions(edit=None, review=None, view=None): "external_review": _("Open External Review"), "proposal_determination": _("Ready For Final Determination"), "proposal_rejected": _("Dismiss"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("Proposal Received"), "stage": Proposal, @@ -964,6 +996,7 @@ def make_permissions(edit=None, review=None, view=None): "external_review": _("Open External Review"), "proposal_determination": _("Ready For Final Determination"), "proposal_rejected": _("Dismiss"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Proposal, @@ -975,6 +1008,7 @@ def make_permissions(edit=None, review=None, view=None): "transitions": { "post_proposal_review_discussion": _("Close Review"), "proposal_discussion": _("Proposal Received (revert)"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("Internal Review"), "public": _("{org_short_name} Review").format( @@ -992,6 +1026,7 @@ def make_permissions(edit=None, review=None, view=None): "proposal_determination": _("Ready For Final Determination"), "proposal_internal_review": _("Open Internal Review (revert)"), "proposal_rejected": _("Dismiss"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": Proposal, @@ -1010,6 +1045,7 @@ def make_permissions(edit=None, review=None, view=None): "method": "create_revision", }, "external_review": _("Open External Review"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Proposal, @@ -1021,6 +1057,7 @@ def make_permissions(edit=None, review=None, view=None): "transitions": { "post_external_review_discussion": _("Close Review"), "post_proposal_review_discussion": _("Ready For Discussion (revert)"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("External Review"), "stage": Proposal, @@ -1036,6 +1073,7 @@ def make_permissions(edit=None, review=None, view=None): "proposal_almost": _("Accept but additional info required"), "proposal_accepted": _("Accept"), "proposal_rejected": _("Dismiss"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("Ready For Discussion"), "stage": Proposal, @@ -1053,6 +1091,7 @@ def make_permissions(edit=None, review=None, view=None): }, "method": "create_revision", }, + "proposal_withdrawn": _("Withdraw"), }, "display": _("More information required"), "stage": Proposal, @@ -1066,6 +1105,7 @@ def make_permissions(edit=None, review=None, view=None): "proposal_almost": _("Accept but additional info required"), "proposal_accepted": _("Accept"), "proposal_rejected": _("Dismiss"), + "proposal_withdrawn": _("Withdraw"), }, "display": _("Ready for Final Determination"), "permissions": hidden_from_applicant_permissions, @@ -1093,6 +1133,11 @@ def make_permissions(edit=None, review=None, view=None): "stage": Proposal, "permissions": no_permissions, }, + "proposal_withdrawn": { + "display": _("Withdrawn"), + "stage": Proposal, + "permissions": staff_edit_permissions, + }, }, ]