Repository: syncope Updated Branches: refs/heads/2_0_X ba511b38b -> 5277bb654 refs/heads/master a247cc51f -> 02a4685a1
Correctly setting candidate groups for approval Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6c83456d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6c83456d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6c83456d Branch: refs/heads/2_0_X Commit: 6c83456dabe3995f4ad7b52f8618123a8c90b0f9 Parents: ba511b3 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Sep 23 12:15:22 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Sep 23 12:15:22 2016 +0200 ---------------------------------------------------------------------- .../src/main/resources/userWorkflow.bpmn20.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/6c83456d/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml b/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml index aa811cf..ce4281a 100644 --- a/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml +++ b/fit/core-reference/src/main/resources/userWorkflow.bpmn20.xml @@ -141,7 +141,8 @@ try { <sequenceFlow id="active2ConfirmPasswordReset" sourceRef="activeGw" targetRef="checkToken4ConfirmPasswordReset"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'confirmPasswordReset'}]]></conditionExpression> </sequenceFlow> - <userTask id="updateApproval" name="Update approval" activiti:candidateGroups="7" activiti:formKey="updateApproval"> + <userTask id="updateApproval" name="Update approval" + activiti:candidateGroups="managingDirector" activiti:formKey="updateApproval"> <extensionElements> <activiti:formProperty id="username" name="Username" type="string" expression="${user.username}" writable="false"/> <activiti:formProperty id="approve" name="Approve?" type="boolean" variable="approve" required="true"/> @@ -187,7 +188,8 @@ try { <sequenceFlow id="flow8ter" sourceRef="rejectUpdate" targetRef="active"/> <serviceTask id="update" name="Update" activiti:expression="#{update.execute(execution.processInstanceId)}"/> <sequenceFlow id="flow9" sourceRef="update" targetRef="active"/> - <userTask id="recertificationRequest" name="Recertification Request" activiti:candidateGroups="managingDirector" activiti:formKey="recertify"> + <userTask id="recertificationRequest" name="Recertification Request" + activiti:candidateGroups="managingDirector" activiti:formKey="recertify"> <extensionElements> <activiti:formProperty id="fullname" name="Identity" type="string" expression="${user.getPlainAttr('fullname').getUniqueValue().getStringValue()}" writable="false"/> <activiti:formProperty id="username" name="Username" type="string" expression="${user.username}" writable="false"/> @@ -238,7 +240,8 @@ try { <sequenceFlow id="rejected2Rejected" sourceRef="rejectedGw" targetRef="rejected"> <conditionExpression xsi:type="tFormalExpression"><![CDATA[${empty task}]]></conditionExpression> </sequenceFlow> - <userTask id="deleteApproval" name="Delete approval" activiti:candidateGroups="7" activiti:formKey="deleteApproval"> + <userTask id="deleteApproval" name="Delete approval" + activiti:candidateGroups="managingDirector" activiti:formKey="deleteApproval"> <extensionElements> <activiti:formProperty id="username" name="Username" type="string" expression="${user.username}" writable="false"/> <activiti:formProperty id="approve" name="Approve?" type="boolean" variable="approve" required="true"/>
