inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2495 / ALF-21892 - Missing Workflow Message Labels

Browse Source 
- added missing workflow messages
    - fixed testMultiInstanceListenersCalled Junit to look for Workflow message

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Forascu
2017-06-20 10:36:00 +00:00
parent 82037ee4b6
commit 63158ba8b2
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
config/alfresco/workflow/workflow-messages.properties
View File

@@ -1,7 +1,7 @@
# Display labels for out-of-the-box Content-oriented Workflows # Display labels for out-of-the-box Content-oriented Workflows
####################### #######################
# ACTIVITI WORKFLOWS # # ACTIVITI WORKFLOWS #
####################### #######################
# #
@@ -54,7 +54,7 @@ publishWebContent.workflow.title=Publish Web Content Activiti Process
publishWebContent.workflow.description=Publishing of web content using Activiti workflow engine publishWebContent.workflow.description=Publishing of web content using Activiti workflow engine
############################ ############################
# WORKFLOW MODEL LABELS # # WORKFLOW MODEL LABELS #
############################ ############################
# Adhoc Task Definitions # Adhoc Task Definitions
@@ -92,6 +92,15 @@ wf_workflowmodel.type.wf_activitiReviewTask.description=Review Documents to Appr
wf_workflowmodel.property.wf_reviewOutcome.title=Review Outcome wf_workflowmodel.property.wf_reviewOutcome.title=Review Outcome
wf_workflowmodel.property.wf_reviewOutcome.description=Approve or Reject the content wf_workflowmodel.property.wf_reviewOutcome.description=Approve or Reject the content
activitiReview.task.wf_submitReviewTask.title=Start Review
activitiReview.task.wf_submitReviewTask.description=Submit documents for review and approval
activitiReview.task.wf_rejectedTask.title=Rejected
activitiReview.task.wf_rejectedTask.description=Rejected
activitiReview.task.wf_approvedTask.title=Approved
activitiReview.task.wf_approvedTask.description=Approved
activitiReview.task.wf_activitiReviewTask.title=Review
activitiReview.task.wf_activitiReviewTask.description=Documents for review and approval
# Parallel Review And Approve Task Definitions # Parallel Review And Approve Task Definitions
wf_workflowmodel.type.wf_submitParallelReviewTask.title=Send Document(s) For Review wf_workflowmodel.type.wf_submitParallelReviewTask.title=Send Document(s) For Review
@@ -118,6 +127,7 @@ activitiParallelReview.task.wf_submitParallelReviewTask.description=Request docu
activitiParallelReview.property.wf_requiredApprovePercent.title=Required Approval Percentage activitiParallelReview.property.wf_requiredApprovePercent.title=Required Approval Percentage
activitiParallelReview.property.wf_requiredApprovePercent.description=Percentage of reviewers who must approve for approval activitiParallelReview.property.wf_requiredApprovePercent.description=Percentage of reviewers who must approve for approval
activitiParallelReview.task.wf_activitiReviewTask.title=Review activitiParallelReview.task.wf_activitiReviewTask.title=Review
activitiParallelReview.task.wf_activitiReviewTask.description=Documents for review and approval
activitiParallelReview.task.wf_rejectedParallelTask.title=Document Rejected activitiParallelReview.task.wf_rejectedParallelTask.title=Document Rejected
activitiParallelReview.task.wf_approvedParallelTask.title=Document Approved activitiParallelReview.task.wf_approvedParallelTask.title=Document Approved
activitiParallelReview.property.wf_reviewerCount.title=Number of Reviewers activitiParallelReview.property.wf_reviewerCount.title=Number of Reviewers
@@ -130,12 +140,21 @@ activitiParallelReview.property.wf_actualPercent.title=Actual Approval Percentag
activitiParallelReview.property.wf_actualPercent.description=Actual approval percentage activitiParallelReview.property.wf_actualPercent.description=Actual approval percentage
activitiParallelReview.property.wf_reviewOutcome.title=Review Outcome activitiParallelReview.property.wf_reviewOutcome.title=Review Outcome
activitiParallelReview.property.wf_reviewOutcome.description=Review Outcome activitiParallelReview.property.wf_reviewOutcome.description=Review Outcome
activitiParallelGroupReview.task.wf_activitiReviewTask.title=Review
activitiParallelGroupReview.task.wf_activitiReviewTask.description=Documents for review and approval
# Pooled Review Task Definitions # Pooled Review Task Definitions
wf_workflowmodel.type.wf_submitGroupReviewTask.title=Start Group Review wf_workflowmodel.type.wf_submitGroupReviewTask.title=Start Group Review
wf_workflowmodel.type.wf_submitGroupReviewTask.description=Submit documents for review and approval to a group of people wf_workflowmodel.type.wf_submitGroupReviewTask.description=Submit documents for review and approval to a group of people
activitiReviewPooled.task.wf_activitiReviewTask.title=Review
activitiReviewPooled.task.wf_activitiReviewTask.description=Documents for review and approval
activitiReviewPooled.task.wf_rejectedTask.title=Document Rejected
activitiReviewPooled.task.wf_rejectedTask.description=Document Rejected
activitiReviewPooled.task.wf_approvedTask.title=Document Approved
activitiReviewPooled.task.wf_approvedTask.description=Document Approved
# List constraint display labels # List constraint display labels
listconstraint.wf_reviewOutcomeOptions.Approve=Approve listconstraint.wf_reviewOutcomeOptions.Approve=Approve
listconstraint.wf_reviewOutcomeOptions.Reject=Reject listconstraint.wf_reviewOutcomeOptions.Reject=Reject

7
source/test-java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowServiceIntegrationTest.java
View File

@@ -331,7 +331,12 @@ public class ActivitiWorkflowServiceIntegrationTest extends AbstractWorkflowServ
personManager.setUser(USER2); personManager.setUser(USER2);
List<WorkflowTask> tasks = workflowService.getAssignedTasks(USER2, WorkflowTaskState.IN_PROGRESS); List<WorkflowTask> tasks = workflowService.getAssignedTasks(USER2, WorkflowTaskState.IN_PROGRESS);
assertEquals(1, tasks.size()); assertEquals(1, tasks.size());
assertEquals("This is the description", tasks.get(0).getDescription());
//Assert task description
assertEquals("Documents for review and approval", tasks.get(0).getDescription());
//Assert workflow link name
assertEquals("This is the description", tasks.get(0).getProperties().get(WorkflowModel.PROP_DESCRIPTION));
} }
/** /**