MID-8706: fir 500 when show work items table with missing target object

Evolveum · Apr 3, 2023 · e04df5b · e04df5b
1 parent 2b9cb7d
commit e04df5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
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
@@ -382,6 +382,9 @@ public static String getReferencedObjectDisplayNamesAndNames(Referencable ref, b
         }
         String name = ref.getTargetName() == null ? "" :
                 (translate ? ref.getTargetName().getOrig() : "");
+        if (StringUtils.isEmpty(name)) {
+            name = ref.getOid();
+        }
         StringBuilder sb = new StringBuilder(name);
         if (showTypes) {
             sb.append(" (");

diff --git a/...ava/com/evolveum/midpoint/gui/impl/component/data/provider/ContainerListDataProvider.java b/...ava/com/evolveum/midpoint/gui/impl/component/data/provider/ContainerListDataProvider.java
@@ -103,7 +103,6 @@ protected Iterator<? extends PrismContainerValueWrapper<C>> doRepositoryIteratio
 
         if (!WebComponentUtil.isSuccessOrHandledError(result)) {
             getPageBase().showResult(result);
-            throw new RestartResponseException(PageError.class);
         }
 
         LOGGER.trace("end::iterator()");

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/data/LinkedReferencePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/data/LinkedReferencePanel.java
@@ -120,7 +120,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                 return false;
             }
 
-            return ref.getOid() != null;
+            return ref.getObject() != null;
         }));
         add(nameLink);
 
@@ -129,6 +129,9 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
             if (ref == null) {
                 return "";
             }
+            if (ref.getTargetName() == null && ref.getObject()== null) {
+                return WebComponentUtil.getReferencedObjectDisplayNamesAndNames(ref.asReferencable(), true, true);
+            }
             return WebComponentUtil.getReferencedObjectDisplayNameAndName(ref.asReferencable(), false, getPageBase());
         });
         nameLinkText.setRenderBodyOnly(true);