Merge pull request #752 from OpenTechFund/feature/workflow-approve-dismiss-directly

Add accept/reject transitions to single and double workflows.

opentech/apply/funds/workflow.py

@@ -152,6 +152,7 @@ SingleStageDefinition = {
             'internal_review': 'Open Review',
             'rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
             'more_info': 'Request More Information',
+            'accepted': {'display': 'Accept', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'Under Discussion',
         'stage': Request,
@@ -165,6 +166,7 @@ SingleStageDefinition = {
                 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
                 'method': 'create_revision',
             },
+            'accepted': {'display': 'Accept', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
             'rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'More information required',
@@ -199,6 +201,8 @@ SingleStageDefinition = {
                 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
                 'method': 'create_revision',
             },
+            'accepted': {'display': 'Accept', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+            'rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'More information required',
         'stage': Request,
@@ -333,6 +337,7 @@ DoubleStageDefinition = {
             'concept_internal_review': 'Open Review',
             'concept_rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
             'concept_more_info': 'Request More Information',
+            'invited_to_proposal': {'display': 'Invite to Proposal', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'Under Discussion',
         'stage': Concept,
@@ -347,6 +352,7 @@ DoubleStageDefinition = {
                 'method': 'create_revision',
             },
             'concept_rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+            'invited_to_proposal': {'display': 'Invite to Proposal', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'More information required',
         'stage': Concept,
@@ -356,6 +362,7 @@ DoubleStageDefinition = {
     'concept_internal_review': {
         'transitions': {
             'concept_review_discussion': 'Close Review',
+            'invited_to_proposal': {'display': 'Invite to Proposal', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'Internal Review',
         'stage': Concept,
@@ -380,6 +387,7 @@ DoubleStageDefinition = {
                 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
                 'method': 'create_revision',
             },
+            'invited_to_proposal': {'display': 'Invite to Proposal', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
         },
         'display': 'More information required',
         'stage': Concept,
@@ -410,6 +418,7 @@ DoubleStageDefinition = {
         'transitions': {
             'proposal_discussion': {'display': 'Submit', 'permissions': {UserPermissions.APPLICANT}, 'method': 'create_revision'},
             'proposal_rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+            'external_review': 'Open AC review',
         },
         'display': 'Invited for Proposal',
         'stage': Proposal,
@@ -421,6 +430,7 @@ DoubleStageDefinition = {
             'proposal_internal_review': 'Open Review',
             'proposal_rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
             'proposal_more_info': 'Request More Information',
+            'external_review': 'Open AC review',
         },
         'display': 'Under Discussion',
         'stage': Proposal,
@@ -435,6 +445,7 @@ DoubleStageDefinition = {
                 'method': 'create_revision',
             },
             'proposal_rejected': {'display': 'Dismiss', 'permissions': {UserPermissions.ADMIN, UserPermissions.LEAD}},
+            'external_review': 'Open AC review',
         },
         'display': 'More information required',
         'stage': Proposal,
@@ -468,6 +479,7 @@ DoubleStageDefinition = {
                 'permissions': {UserPermissions.APPLICANT, UserPermissions.LEAD, UserPermissions.ADMIN},
                 'method': 'create_revision',
             },
+            'external_review': 'Open AC review',
         },
         'display': 'More information required',
         'stage': Proposal,