diff --git a/config/alfresco/model/bpmModel.xml b/config/alfresco/model/bpmModel.xml index 0b03cbf3d6..72d13d8eee 100644 --- a/config/alfresco/model/bpmModel.xml +++ b/config/alfresco/model/bpmModel.xml @@ -245,6 +245,12 @@ true + + + + d:boolean + true + diff --git a/config/alfresco/workflow/invitation-nominated-workflow-model.xml b/config/alfresco/workflow/invitation-nominated-workflow-model.xml index 9b45f6f7c8..e2f320c983 100644 --- a/config/alfresco/workflow/invitation-nominated-workflow-model.xml +++ b/config/alfresco/workflow/invitation-nominated-workflow-model.xml @@ -45,9 +45,12 @@ bpm:workflowTask - - cancel - + + cancel + + + false + inwf:nominatedInvitationStats diff --git a/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java index fa1d1e559c..e3eaf909ac 100644 --- a/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java +++ b/source/java/org/alfresco/repo/forms/processor/workflow/TaskFormProcessor.java @@ -27,6 +27,7 @@ package org.alfresco.repo.forms.processor.workflow; import java.io.Serializable; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -194,9 +195,16 @@ public class TaskFormProcessor extends AbstractWorkflowFormProcessor getHiddenTransitions(WorkflowTask task) { Serializable hiddenValues = task.getProperties().get(WorkflowModel.PROP_HIDDEN_TRANSITIONS); - if(hiddenValues!=null && hiddenValues instanceof List) + if (hiddenValues != null) { - return (List) hiddenValues; + if (hiddenValues instanceof List) + { + return (List) hiddenValues; + } + else if (hiddenValues instanceof String) + { + return Arrays.asList(((String)hiddenValues).split(",")); + } } return Collections.emptyList(); }