small fixes for GUI:

-> better check for isVirtual so the display name is displayed correctly -> better error handling while loading prism object to create wrapper
Evolveum · Oct 12, 2022 · c4dd702 · c4dd702
1 parent bc47ec9
commit c4dd702
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -511,21 +511,20 @@ private PrismObject<O> loadPrismObject() {
         Task task = createSimpleTask(OPERATION_LOAD_OBJECT);
         OperationResult result = task.getResult();
         PrismObject<O> prismObject;
-        if (!isEditObject()) {
-            try {
+        try {
+            if (!isEditObject()) {
                 prismObject = getPrismContext().createObject(getType());
-            } catch (Exception ex) {
-                result.recordFatalError(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"), ex);
-                LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex);
-                throw redirectBackViaRestartResponseException();
+            } else {
+                String focusOid = getObjectOidParameter();
+                prismObject = WebModelServiceUtils.loadObject(getType(), focusOid, getOperationOptions(), false, this, task, result);
+                LOGGER.trace("Loading object: Existing object (loadled): {} -> {}", focusOid, prismObject);
             }
-        } else {
-            String focusOid = getObjectOidParameter();
-            prismObject = WebModelServiceUtils.loadObject(getType(), focusOid, getOperationOptions(), false, this, task, result);
-            LOGGER.trace("Loading object: Existing object (loadled): {} -> {}", focusOid, prismObject);
+        } catch (Exception ex) {
+            result.recordFatalError(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"), ex);
+            LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex);
+            throw redirectBackViaRestartResponseException();
         }
-        result.recordSuccess();
-
+        result.computeStatusIfUnknown();
         showResult(result, false);
         return prismObject;
     }

diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java b/...ain/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
@@ -611,7 +611,7 @@ public List<VirtualContainerItemSpecificationType> getVirtualItems() {
 
     @Override
     public boolean isVirtual() {
-        return virtualItems != null;
+        return virtualItems != null && !virtualItems.isEmpty();
     }
 
     @Override