diff --git a/config/alfresco/messages/bpm-messages.properties b/config/alfresco/messages/bpm-messages.properties index 873f925897..06475bf1c9 100644 --- a/config/alfresco/messages/bpm-messages.properties +++ b/config/alfresco/messages/bpm-messages.properties @@ -37,12 +37,15 @@ bpm_businessprocessmodel.property.bpm_workflowInstanceId.title=Workflow Instance bpm_businessprocessmodel.property.bpm_workflowInstanceId.description=Workflow Instance Id bpm_businessprocessmodel.property.bpm_context.title=Task Context bpm_businessprocessmodel.property.bpm_context.description=The context within which this task has been assigned +bpm_businessprocessmodel.property.bpm_outcome.title=Task Outcome +bpm_businessprocessmodel.property.bpm_outcome.description=Decision made on completing Task +bpm_businessprocessmodel.property.bpm_completedItems.title=Completed Items +bpm_businessprocessmodel.property.bpm_completedItems.description=Package items marked as complete +bpm_businessprocessmodel.property.bpm_packageActionGroup.title=Package Actions +bpm_businessprocessmodel.property.bpm_packageActionGroup.description=Actions available on workflow package +bpm_businessprocessmodel.property.bpm_packageItemActionGroup.title=Package Item Actions +bpm_businessprocessmodel.property.bpm_packageItemActionGroup.description=Actions available on workflow package items bpm_businessprocessmodel.association.bpm_package.title=Content Package bpm_businessprocessmodel.association.bpm_package.description=The collection of content routed through the workflow -bpm_businessprocessmodel.association.bpm_completedItems.title=Completed Items -bpm_businessprocessmodel.association.bpm_completedItems.description=Package items marked as complete - -# Workflow Package - bpm_businessprocessmodel.aspect.bpm_workflowPackage.title=Workflow Package bpm_businessprocessmodel.aspect.bpm_workflowPackage.description=The collection of content routed through the workflow diff --git a/config/alfresco/messages/workflow-messages.properties b/config/alfresco/messages/workflow-messages.properties index 5b78a1e526..c21e80fc32 100644 --- a/config/alfresco/messages/workflow-messages.properties +++ b/config/alfresco/messages/workflow-messages.properties @@ -13,30 +13,31 @@ 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_priority.title=Review Priority -wf_workflowmodel.property.wf_priority.description=Review Priority +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.task.wf_review.title=Review -wf_review.task.wf_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_rejected.title=Rejected -wf_review.task.wf_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_approved.title=Approved -wf_review.task.wf_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 diff --git a/config/alfresco/model/workflowModel.xml b/config/alfresco/model/workflowModel.xml index f1029ac830..a99021bf1a 100644 --- a/config/alfresco/model/workflowModel.xml +++ b/config/alfresco/model/workflowModel.xml @@ -63,11 +63,11 @@ - + workflow_collection_actions - + workflow_item_collection_actions @@ -86,7 +86,7 @@ - + workflow_item_edit_actions diff --git a/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java b/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java index 538c72cfbe..b9f2600bab 100644 --- a/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java +++ b/source/java/org/alfresco/repo/dictionary/M2ClassDefinition.java @@ -191,6 +191,15 @@ import org.alfresco.service.namespace.QName; { ((M2AssociationDefinition)def).resolveDependencies(query); } + + for (Map.Entry override : propertyOverrides.entrySet()) + { + PropertyDefinition propDef = query.getProperty(override.getKey()); + if (propDef == null) + { + throw new DictionaryException("Class " + name.toPrefixString() + " attempting to override property " + override.getKey().toPrefixString() + " which does not exist"); + } + } for (QName aspectName : defaultAspectNames) { diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java index 8d61c1ee2a..e61718f534 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImplTest.java @@ -70,7 +70,6 @@ public class WorkflowServiceImplTest extends BaseSpringTest NodeRef nodeRef = workflowService.createPackage(null); assertNotNull(nodeRef); assertTrue(nodeService.hasAspect(nodeRef, WorkflowModel.ASPECT_WORKFLOW_PACKAGE)); - setComplete(); } } diff --git a/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml b/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml index 9e694b7a84..063bcc5cf5 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml +++ b/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml @@ -21,7 +21,7 @@ - +