Merge remote-tracking branch 'origin/master' into feature/plugin-support

Evolveum · Sep 12, 2019 · c0aef03 · c0aef03
2 parents 6817acc + bfc765f
commit c0aef03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java
@@ -100,7 +100,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         actionButtonsContainer.add(workItemRejectButton);
 
         AjaxButton workItemDelegateButton = new AjaxButton(ID_WORK_ITEM_DELEGATE_BUTTON,
-                createStringResource("pageWorkItem.button.delegate")) {
+                createStringResource("pageWorkItem.button.forward")) {
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -161,7 +161,7 @@ private void delegateConfirmedPerformed(AjaxRequestTarget target, UserType deleg
             List<ObjectReferenceType> delegates = Collections.singletonList(ObjectTypeUtil.createObjectRef(delegate, getPrismContext()));
             try {
                 WebComponentUtil.assumePowerOfAttorneyIfRequested(result, getPowerDonor(), getPageBase());
-                getPageBase().getWorkflowService().delegateWorkItem(WorkItemId.of(getModelObject()), delegates, WorkItemDelegationMethodType.ADD_ASSIGNEES,
+                getPageBase().getWorkflowService().delegateWorkItem(WorkItemId.of(getModelObject()), delegates, WorkItemDelegationMethodType.REPLACE_ASSIGNEES,
                         task, result);
             } finally {
                 WebComponentUtil.dropPowerOfAttorneyIfRequested(result, getPowerDonor(), getPageBase());

diff --git a/...m/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java b/...m/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
@@ -17,6 +17,7 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.wf.util.ApprovalUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -115,7 +116,13 @@ private static void addInformationFromRecordedStage(ApprovalStageExecutionInform
 		for (CaseEventType event : executionRecord.getEvent()) {
 			if (event instanceof WorkItemEventType) {
 				WorkItemEventType workItemEvent = (WorkItemEventType) event;
-				ObjectReferenceType approver = workItemEvent.getOriginalAssigneeRef();
+				ObjectReferenceType approver;
+				if (event instanceof WorkItemDelegationEventType){
+					List<ObjectReferenceType> delegateToList = ((WorkItemDelegationEventType)event).getDelegatedTo();
+					approver = CollectionUtils.isNotEmpty(delegateToList) ? delegateToList.get(0) : null;
+				} else {
+					approver = workItemEvent.getOriginalAssigneeRef();
+				}
 				if (approver == null) {
 					LOGGER.warn("No original assignee in work item event {} -- ignoring it", workItemEvent);
 					continue;
@@ -152,7 +159,8 @@ private static void addInformationFromRecordedStage(ApprovalStageExecutionInform
 			if (workItem.getStageNumber() == null || workItem.getStageNumber() != currentStageNumber){
 				continue;
 			}
-			ObjectReferenceType approver = workItem.getOriginalAssigneeRef();
+			ObjectReferenceType approver = CollectionUtils.isNotEmpty(workItem.getAssigneeRef()) ?
+					workItem.getAssigneeRef().get(0) : workItem.getOriginalAssigneeRef();
 			if (approver == null) {
 				LOGGER.warn("No original assignee in work item {} -- ignoring it", workItem);
 				continue;