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

105662: SHA-944: Change Order of Email Send to Be After Adding Site
     - Changed workflow order


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ray Gauss
2015-08-25 14:02:06 +00:00
parent f288825e2e
commit dd308bc12f

View File

@@ -8,16 +8,15 @@
<startEvent id="start" activiti:formKey="inwf:inviteToSiteTask" /> <startEvent id="start" activiti:formKey="inwf:inviteToSiteTask" />
<!-- TODO: SHA-944: Change Order of Email Send to Be After Adding Site --> <sequenceFlow id="flow1" sourceRef="start" targetRef="accepted" />
<sequenceFlow id="flow1" sourceRef="start" targetRef="sendInvite" />
<serviceTask id="accepted" name="Accepted" activiti:delegateExpression="${AcceptNominatedInviteDelegate}" />
<sequenceFlow id="flow2" sourceRef="accepted" targetRef="sendInvite" />
<serviceTask id="sendInvite" name="Send Invite" activiti:delegateExpression="${SendNominatedInviteAddDirectDelegate}" /> <serviceTask id="sendInvite" name="Send Invite" activiti:delegateExpression="${SendNominatedInviteAddDirectDelegate}" />
<sequenceFlow id="flow2" sourceRef="sendInvite" targetRef="accepted" /> <sequenceFlow id="flow3" sourceRef="sendInvite" targetRef="inviteAccepted" />
<serviceTask id="accepted" name="Accepted" activiti:delegateExpression="${AcceptNominatedInviteDelegate}" />
<sequenceFlow id="flow3" sourceRef="accepted" targetRef="inviteAccepted" />
<userTask id="inviteAccepted" name="Invitation Accepted" <userTask id="inviteAccepted" name="Invitation Accepted"
activiti:formKey="inwf:acceptInviteTask" > activiti:formKey="inwf:acceptInviteTask" >
<extensionElements> <extensionElements>