more display name (name) unifying

Evolveum · Jul 23, 2021 · 0cba82d · 0cba82d
1 parent 62f3fd7
commit 0cba82d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 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
@@ -338,17 +338,17 @@ public static String getReferencedObjectDisplayNameAndName(Referencable ref, boo
         if (ref == null || ref.getOid() == null) {
             return "";
         }
-        if (!loadObject) {
+        if (ref.asReferenceValue().getObject() == null && !loadObject) {
             return getReferencedObjectDisplayNamesAndNames(ref, false, true);
         }
-        PrismObject<ObjectType> prismObject = WebModelServiceUtils.loadObject(ref, pageBase);
+        PrismObject<ObjectType> prismObject = ref.asReferenceValue().getObject();
+        if (prismObject == null) {
+            prismObject = WebModelServiceUtils.loadObject(ref, pageBase);
+        }
         if (prismObject == null) {
             return getReferencedObjectDisplayNamesAndNames(ref, false, true);
         }
         ObjectType object = prismObject.asObjectable();
-        if (object == null) {
-             return "";
-        }
         String displayName = null;
         if (object instanceof UserType) {
             displayName = getTranslatedPolyString(((UserType) object).getFullName());

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
@@ -124,12 +124,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
             if (ref == null) {
                 return "";
             }
-
-            if (ref.getObject() != null) {
-                return WebComponentUtil.getDisplayNameOrName(ref.getObject());
-            }
-
-            return WebComponentUtil.getDisplayNameOrName(ref.asReferencable());
+            return WebComponentUtil.getReferencedObjectDisplayNameAndName(ref.asReferencable(), false, getPageBase());
         }));
         nameLinkText.setOutputMarkupId(true);
         nameLink.add(nameLinkText);