Workflow

- full "group" / "pooled task" sample workflow definitions (with UI dialogs)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/bpm-messages.properties

@@ -62,3 +62,9 @@ bpm_businessprocessmodel.property.bpm_workflowPriority.title=Workflow Priority
 bpm_businessprocessmodel.property.bpm_workflowPriority.description=Workflow Priority
 bpm_businessprocessmodel.association.bpm_assignee.title=Workflow Assignee
 bpm_businessprocessmodel.association.bpm_assignee.description=Workflow Assignee
+bpm_businessprocessmodel.association.bpm_assignees.title=Workflow Assignees
+bpm_businessprocessmodel.association.bpm_assignees.description=Workflow Assignees
+bpm_businessprocessmodel.association.bpm_groupAssignee.title=Workflow Group Assignee
+bpm_businessprocessmodel.association.bpm_groupAssignee.description=Workflow Group Assignee
+bpm_businessprocessmodel.association.bpm_groupAssignees.title=Workflow Group Assignees
+bpm_businessprocessmodel.association.bpm_groupAssignees.description=Workflow Group Assignees

config/alfresco/messages/workflow-messages.properties

@@ -1,85 +0,0 @@
-# Display labels for out-of-the-box Content-oriented Workflows
-
-#
-# Review & Approve Workflow
-#
-
-wf_review.workflow.title=Review & Approve
-wf_review.workflow.description=Review & approval of content
-
-# Review & Approve Task Definitions
-
-wf_workflowmodel.type.wf_submitReviewTask.title=Submit Review
-wf_workflowmodel.type.wf_submitReviewTask.description=Submit documents for review & approval
-wf_workflowmodel.property.wf_reviewDueDate.title=Review Due Date
-wf_workflowmodel.property.wf_reviewDueDate.description=Review Due Date
-wf_workflowmodel.property.wf_reviewPriority.title=Review Priority
-wf_workflowmodel.property.wf_reviewPriority.description=Review Priority
-wf_workflowmodel.association.wf_reviewer.title=Reviewer
-wf_workflowmodel.association.wf_reviewer.description=Reviewer
-
-wf_workflowmodel.type.wf_reviewTask.title=Review
-wf_workflowmodel.type.wf_reviewTask.description=Review Documents to Approve or Reject them
-
-# Review & Approve Process Definitions
-
-wf_review.node.start.title=Start
-wf_review.node.start.description=Start
-wf_review.node.review.title=Review
-wf_review.node.review.description=Review
-wf_review.node.review.transition.reject.title=Reject
-wf_review.node.review.transition.reject.description=Reject
-wf_review.node.review.transition.approve.title=Approve
-wf_review.node.review.transition.approve.description=Approve
-wf_review.node.rejected.title=Rejected
-wf_review.node.rejected.description=Rejected
-wf_review.task.wf_rejectedTask.title=Rejected
-wf_review.task.wf_rejectedTask.description=Rejected
-wf_review.node.approved.title=Approved
-wf_review.node.approved.description=Approved
-wf_review.task.wf_approvedTask.title=Approved
-wf_review.task.wf_approvedTask.description=Approved
-wf_review.node.end.title=End
-wf_review.node.end.description=End
-
-
-#
-# Adhoc Task Workflow
-#
-
-wf_adhoc.workflow.title=Adhoc Task
-wf_adhoc.workflow.description=Assign task to colleague
-
-# Adhoc Task Definitions
-
-wf_workflowmodel.type.wf_submitAdhocTask.title=Submit Adhoc Task
-wf_workflowmodel.type.wf_submitAdhocTask.description=Allocate task to colleague
-wf_workflowmodel.property.wf_adhocDescription.title=Task Description
-wf_workflowmodel.property.wf_adhocDescription.description=Description of what needs to be achieved
-wf_workflowmodel.property.wf_adhocDueDate.description=Task Due Date
-wf_workflowmodel.property.wf_adhocPriority.title=Task Priority
-wf_workflowmodel.property.wf_notifyMe.title=Notify Me
-wf_workflowmodel.property.wf_notifyMe.description=Notify me when task is complete
-wf_workflowmodel.association.wf_assignee.title=Assignee
-wf_workflowmodel.association.wf_assignee.description=Who's doing the task
-wf_workflowmodel.type.wf_adhocTask.title=Adhoc Task
-wf_workflowmodel.type.wf_adhocTask.description=Adhoc Task allocated by colleague
-wf_workflowmodel.type.wf_completedAdhocTask.title=Adhoc Task Completed
-wf_workflowmodel.type.wf_completedAdhocTask.description=Adhoc Task Completed
-
-#
-# WCM Submit Workflow.
-#
-wcmwf_submit.workflow.title=WCM Submit
-wcmwf_submit.workflow.description=Submit Web Content
-
-wcmwf_submitmodel.type.wcmwf_startSubmit.title=Submit Web Content
-wcmwf_submitmodel.type.wcmwf_startSubmit.description=Have colleague review changes
-wcmwf_submitmodel.association.wcmwf_assignee.title=Assignee
-wcmwf_submitmodel.association.wcmwf_assignee.description=Who's doing the reviewing
-wcmwf_submitmodel.property.wcmwf_description.title=Task Description
-wcmwf_submitmodel.property.wcmwf_description.description=Description of what needs to be achieved
-wcmwf_submitmodel.type.wcmwf_setupSubmit.title=Submit Web Content
-wcmwf_submitmodel.type.wcmwf_setupSubmit.description=Choose a colleague to review changes
-wcmwf_submitmodel.type.wcmwf_review.title=Review Content
-wcmwf_submitmodel.type.wcmwf_review.description=Review Content

config/alfresco/workflow/workflow-messages.properties

@@ -44,13 +44,13 @@ wf_review.node.end.description=End
 # Parallel Review Workflow
 #
 
-wf_parallelreview.workflow.title=Group Review & Approve
+wf_parallelreview.workflow.title=Parallel Review & Approve
-wf_parallelreview.workflow.description=Group Review & approval of content
+wf_parallelreview.workflow.description=Parallel Review & approval of content
 
 # Parallel Review & Approve Task Definitions
 
-wf_workflowmodel.type.wf_submitParallelReviewTask.title=Start Group Review
+wf_workflowmodel.type.wf_submitParallelReviewTask.title=Start Parallel Review
-wf_workflowmodel.type.wf_submitParallelReviewTask.description=Submit documents for review & approval to a group of people
+wf_workflowmodel.type.wf_submitParallelReviewTask.description=Submit documents for review & approval to a list of people
 wf_workflowmodel.property.wf_requiredApprovePercent.title=Required approval percentage
 wf_workflowmodel.property.wf_requiredApprovePercent.description=Percentage of reviewers who must approve for approval
 wf_workflowmodel.type.wf_rejectedParallelTask.title=Rejected
@@ -74,6 +74,35 @@ wf_parallelreview.node.review.transition.approve.title=Approve
 wf_parallelreview.node.review.transition.approve.description=Approve
 
 
+#
+# Pooled Review Workflow
+#
+
+wf_reviewpooled.workflow.title=Pooled Review & Approve
+wf_reviewpooled.workflow.description=Pooled review & approval of content
+
+wf_workflowmodel.type.wf_submitGroupReviewTask.title=Start Group Review
+wf_workflowmodel.type.wf_submitGroupReviewTask.description=Submit documents for review & approval to a group of people
+
+wf_reviewpooled.node.review.transition.reject.title=Reject
+wf_reviewpooled.node.review.transition.reject.description=Reject
+wf_reviewpooled.node.review.transition.approve.title=Approve
+wf_reviewpooled.node.review.transition.approve.description=Approve
+
+
+#
+# Parallel Group Review Workflow
+#
+
+wf_parallelgroupreview.workflow.title=Group Review & Approve
+wf_parallelgroupreview.workflow.description=Group review & approval of content
+
+wf_parallelgroupreview.node.review.transition.reject.title=Reject
+wf_parallelgroupreview.node.review.transition.reject.description=Reject
+wf_parallelgroupreview.node.review.transition.approve.title=Approve
+wf_parallelgroupreview.node.review.transition.approve.description=Approve
+
+
 #
 # Adhoc Task Workflow
 #

source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJavaScript.java

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.jscript.Node;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -116,6 +117,10 @@ public class AlfrescoJavaScript extends JBPMSpringActionHandler
 
         // execute
         Object result = executeScript(executionContext, services, expression, variableAccesses);
+        if (result instanceof Node)
+        {
+            result = new JBPMNode(((Node)result).getNodeRef(), services);
+        }
 
         // map script return variable to process context
         VariableAccess returnVariable = getWritableVariable(variableAccesses);