From a1a53bc3de15a5de92d9c2cf56a1d9fe0bb68dd2 Mon Sep 17 00:00:00 2001 From: Ahmed Owian Date: Wed, 7 Oct 2015 20:10:40 +0000 Subject: [PATCH] Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1) 113487 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted - Removed user task step from add-direct workflow - Added check for completed start task in InvitationServiceImpl to avoid error throwing git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../workflow/invitation-add-direct.bpmn20.xml | 22 +------------------ .../invitation/InvitationServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/config/alfresco/workflow/invitation-add-direct.bpmn20.xml b/config/alfresco/workflow/invitation-add-direct.bpmn20.xml index e5f5545099..3df81b2a49 100644 --- a/config/alfresco/workflow/invitation-add-direct.bpmn20.xml +++ b/config/alfresco/workflow/invitation-add-direct.bpmn20.xml @@ -15,28 +15,8 @@ - - - - - - - - if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority; - - - - - - - ${initiator.exists() ? initiator.properties.userName : 'admin'} - - - + - - diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java index 9a79ae4a4b..bb79673be0 100644 --- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java +++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java @@ -1525,7 +1525,10 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli logger.debug("Transitioning Invite workflow task..."); try { - workflowService.endTask(startTask.getId(), null); + if (startTask != null && startTask.getState() != WorkflowTaskState.COMPLETED) + { + workflowService.endTask(startTask.getId(), null); + } } catch (RuntimeException err) {