inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)

Browse Source 
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:
Ahmed Owian
2015-10-07 20:10:40 +00:00
parent fab1a86082
commit a1a53bc3de
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/alfresco/workflow/invitation-add-direct.bpmn20.xml
View File

@@ -15,28 +15,8 @@
<serviceTask id="sendInvite" name="Send Invite" activiti:delegateExpression="${SendNominatedInviteAddDirectDelegate}" />
<sequenceFlow id="flow3" sourceRef="sendInvite" targetRef="inviteAccepted" />
<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="flow3" sourceRef="sendInvite" targetRef="end" />
<sequenceFlow id="flow4" sourceRef="inviteAccepted" targetRef="end" />
<endEvent id="end" />
</process>

5
source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
View File

@@ -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)
{