From 43fc70831fd22e41099371d9be2dd81eae4592dc Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Tue, 7 Mar 2017 18:41:03 +0100 Subject: [PATCH] Showing completion on timeout in the GUI (MID-3799:4). --- .../web/page/admin/workflow/dto/DecisionDto.java | 12 ++++++++++++ .../main/resources/localization/Midpoint.properties | 4 +++- .../resources/localization/Midpoint_en.properties | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java index dc3a79ac241..b62d67a3e2c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java @@ -108,6 +108,18 @@ public static DecisionDto create(WfProcessEventType e, @Nullable PageBase pageBa rv.comment = result.getComment(); // TODO what about additional delta? } + WorkItemEventCauseInformationType cause = completionEvent.getCause(); + if (cause != null && cause.getType() == WorkItemEventCauseTypeType.TIMED_ACTION) { + rv.user = PageBase.createStringResourceStatic(null, + "DecisionDto." + (rv.outcome ? "approvedDueToTimeout" : "rejectedDueToTimeout")).getString(); + if (rv.comment == null) { + if (cause.getDisplayName() != null) { + rv.comment = cause.getDisplayName(); + } else if (cause.getName() != null) { + rv.comment = cause.getName(); + } + } + } rv.escalationLevelNumber = completionEvent.getEscalationLevelNumber(); if (completionEvent.getOriginalAssigneeRef() != null && pageBase != null) { // TODO optimize repo access diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index 4894b11000a..2b9eed43678 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -3521,7 +3521,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties index 6978e59c456..1109420882d 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties @@ -3480,7 +3480,7 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object