Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jul 12, 2021 · 07d1b87 · 07d1b87
2 parents cb2460e + 02908f9
commit 07d1b87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -4649,6 +4649,18 @@ public static void workItemApproveActionPerformed(AjaxRequestTarget target, Case
         pageBase.showResult(result);
     }
 
+    public static OperationResultStatusPresentationProperties caseOutcomeUriToIcon(String outcome) {
+        if (outcome == null) {
+            return OperationResultStatusPresentationProperties.IN_PROGRESS;
+        } else if (QNameUtil.matchUri(outcome, SchemaConstants.MODEL_APPROVAL_OUTCOME_APPROVE)) {
+            return OperationResultStatusPresentationProperties.SUCCESS;
+        } else if (QNameUtil.matchUri(outcome, SchemaConstants.MODEL_APPROVAL_OUTCOME_REJECT)) {
+            return OperationResultStatusPresentationProperties.FATAL_ERROR;
+        } else {
+            return OperationResultStatusPresentationProperties.UNKNOWN;
+        }
+    }
+
     public static List<ObjectOrdering> createMetadataOrdering(SortParam<String> sortParam, String metadataProperty, PrismContext prismContext) {
         if (sortParam != null && sortParam.getProperty() != null) {
             OrderDirection order = sortParam.isAscending() ? OrderDirection.ASCENDING : OrderDirection.DESCENDING;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -962,7 +962,8 @@ private static void processCaseOutcome(CaseType caseType, Map<DisplayType, Integ
                 try {
                     result = OperationResultStatusType.fromValue(caseType.getOutcome());
                 } catch (IllegalArgumentException e) {
-                    putDisplayTypeToMapWithCount(map, one, WebComponentUtil.createDisplayType(OperationResultStatusPresentationProperties.UNKNOWN));
+                    putDisplayTypeToMapWithCount(map, one,
+                            WebComponentUtil.createDisplayType(WebComponentUtil.caseOutcomeUriToIcon(caseType.getOutcome())));
                     return;
                 }
                 OperationResultStatusPresentationProperties resultStatus = OperationResultStatusPresentationProperties.parseOperationalResultStatus(result);