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

Evolveum · Jan 19, 2022 · 7a82a09 · 7a82a09
2 parents 021fed6 + 15db665
commit 7a82a09
Show file tree

Hide file tree

Showing 2 changed files with 18 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
@@ -2831,7 +2831,18 @@ public static <AR extends AbstractRoleType> IModel<String> createAbstractRoleCon
         }
         String members = atLeastOneWithMembers ? ".members" : "";
         ObjectTypes objectType = ObjectTypes.getObjectType(abstractRoleTable.getType());
-        String propertyKeyPrefix = ObjectTypes.SERVICE.equals(objectType) ? "pageServices" : "pageRoles";
+        String propertyKeyPrefix = "";
+        switch (objectType) {
+            case SERVICE:
+                propertyKeyPrefix = "pageServices";
+                break;
+            case ROLE:
+                propertyKeyPrefix = "pageRoles";
+                break;
+            case ORG:
+                propertyKeyPrefix = "pageOrgs";
+                break;
+        }
 
         if (action.getRowModel() == null) {
             return pageBase.createStringResource(propertyKeyPrefix + ".message.confirmationMessageForMultipleObject" + members,

diff --git a/model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/AbstractRestController.java b/model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/AbstractRestController.java
@@ -133,6 +133,12 @@ protected ResponseEntity<?> handleException(OperationResult result, Throwable t)
     }
 
     protected ResponseEntity<?> handleExceptionNoLog(OperationResult result, Throwable t) {
+        if (result.isEmpty()) {
+            result.recordFatalError("Unknown exception occurred", t);
+        } else {
+            result.computeStatus();
+        }
+
         return createErrorResponseBuilder(result, t);
     }