mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
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
This commit is contained in:
@@ -15,28 +15,8 @@
|
|||||||
|
|
||||||
<serviceTask id="sendInvite" name="Send Invite" activiti:delegateExpression="${SendNominatedInviteAddDirectDelegate}" />
|
<serviceTask id="sendInvite" name="Send Invite" activiti:delegateExpression="${SendNominatedInviteAddDirectDelegate}" />
|
||||||
|
|
||||||
<sequenceFlow id="flow3" sourceRef="sendInvite" targetRef="inviteAccepted" />
|
<sequenceFlow id="flow3" sourceRef="sendInvite" targetRef="end" />
|
||||||
|
|
||||||
<userTask id="inviteAccepted" name="Invitation Accepted"
|
|
||||||
activiti:formKey="inwf:acceptInviteTask" >
|
|
||||||
<extensionElements>
|
|
||||||
<activiti:taskListener event="create" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
|
|
||||||
<activiti:field name="script">
|
|
||||||
<activiti:string>
|
|
||||||
if (typeof bpm_workflowPriority != 'undefined') task.priority = bpm_workflowPriority;
|
|
||||||
</activiti:string>
|
|
||||||
</activiti:field>
|
|
||||||
</activiti:taskListener>
|
|
||||||
</extensionElements>
|
|
||||||
<humanPerformer>
|
|
||||||
<resourceAssignmentExpression>
|
|
||||||
<formalExpression>${initiator.exists() ? initiator.properties.userName : 'admin'}</formalExpression>
|
|
||||||
</resourceAssignmentExpression>
|
|
||||||
</humanPerformer>
|
|
||||||
</userTask>
|
|
||||||
|
|
||||||
<sequenceFlow id="flow4" sourceRef="inviteAccepted" targetRef="end" />
|
|
||||||
|
|
||||||
<endEvent id="end" />
|
<endEvent id="end" />
|
||||||
</process>
|
</process>
|
||||||
|
|
||||||
|
@@ -1525,7 +1525,10 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
|
|||||||
logger.debug("Transitioning Invite workflow task...");
|
logger.debug("Transitioning Invite workflow task...");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
workflowService.endTask(startTask.getId(), null);
|
if (startTask != null && startTask.getState() != WorkflowTaskState.COMPLETED)
|
||||||
|
{
|
||||||
|
workflowService.endTask(startTask.getId(), null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (RuntimeException err)
|
catch (RuntimeException err)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user