From b971b7165874b9d1396f172602fdc370650eca22 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Wed, 8 Sep 2010 13:32:05 +0000 Subject: [PATCH] Fix for ALF-4647 (All sample workflows should be enabled OOTB) & ALF-4638 (The transition buttons on the edit task page sometimes change order) and a couple of other unreported issues found along the way. The pooled and parallel workflow definitions are now enabled by default, all corresponding form configuration for the start tasks and other task types are also defined, some tweaking may be need after review from Linton. Fixed a potential NPE when transition id's are returned as null. Log warnings added to the task type config evaluator when the type can not be retrieved, which gives an indication as to why forms display all the default fields rather than the configured ones. Changed process definitions to use a consistent ordering for the Approve and Reject transitions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/workflow/WorkflowModelBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java index a53074c362..f8ea467a67 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java @@ -554,7 +554,7 @@ public class WorkflowModelBuilder { Map model = new HashMap(); String id = workflowTransition.getId(); - model.put(WORKFLOW_NODE_TRANSITION_ID, id); + model.put(WORKFLOW_NODE_TRANSITION_ID, id == null ? "" : id); model.put(WORKFLOW_NODE_TRANSITION_TITLE, workflowTransition.getTitle()); model.put(WORKFLOW_NODE_TRANSITION_DESCRIPTION, workflowTransition.getDescription()); model.put(WORKFLOW_NODE_TRANSITION_IS_DEFAULT, workflowTransition.isDefault());