Merge branch 'support-4.0' of https://github.com/Evolveum/midpoint in…

…to support-4.0
Evolveum · Jan 4, 2020 · f65a92d · f65a92d
2 parents e311096 + a0a0d67
commit f65a92d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 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
@@ -1290,7 +1290,7 @@ public static String getDisplayNameOrName(ObjectReferenceType ref) {
     }
 
     // <display-name> (<name>) OR simply <name> if there's no display name
-    private static String getDisplayNameAndName(ObjectReferenceType ref) {
+    public static String getDisplayNameAndName(ObjectReferenceType ref) {
         if (ref == null) {
             return null;
         }

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
@@ -13,6 +13,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.web.component.data.column.ImagePanel;
 import com.evolveum.midpoint.web.component.util.EnableBehaviour;
@@ -108,7 +109,17 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         nameLink.setOutputMarkupId(true);
         add(nameLink);
 
-        Label nameLinkText = new Label(ID_NAME_TEXT, Model.of(WebComponentUtil.getDisplayName(referencedObjectModel.getObject().asPrismObject())));
+        ObjectType referencedObject= referencedObjectModel.getObject();
+        ObjectReferenceType referencedObjectRef = WebComponentUtil.createObjectRef(referencedObject.getOid(), referencedObject.getName().getOrig(), WebComponentUtil.classToQName(getPageBase().getPrismContext(), referencedObject.getClass()));
+        PrismReferenceValue referenceValue = getPageBase().getPrismContext().itemFactory().createReferenceValue(referencedObject.getOid(),
+                        WebComponentUtil.classToQName(getPageBase().getPrismContext(), referencedObject.getClass()));
+        referenceValue.setObject(referencedObject.asPrismObject());
+        referencedObjectRef.setupReferenceValue(referenceValue);
+
+        String nameLinkTextVal = (referencedObject instanceof UserType)?WebComponentUtil.getDisplayNameAndName(referencedObjectRef):
+                WebComponentUtil.getDisplayNameOrName(referencedObjectRef);
+
+        Label nameLinkText = new Label(ID_NAME_TEXT, Model.of(nameLinkTextVal));
         nameLinkText.setOutputMarkupId(true);
         nameLink.add(nameLinkText);
 

diff --git a/...java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java b/...java/com/evolveum/midpoint/web/component/wf/ApprovalProcessExecutionInformationPanel.java
@@ -212,7 +212,7 @@ private String getStageNameLabel(ApprovalStageExecutionInformationDto stage, int
 
     private String getApproverLabel(String labelKey, ObjectReferenceType ref) {
         if (ref != null) {
-            return getString(labelKey) + ": " + WebComponentUtil.getDisplayName(ref);
+            return getString(labelKey) + ": " + WebComponentUtil.getDisplayNameAndName(ref);
         } else {
             return "";
         }

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
@@ -547,12 +547,7 @@ public static PolyStringType getDisplayName(ObjectType object) {
         if (object instanceof AbstractRoleType) {
             return ((AbstractRoleType) object).getDisplayName();
         } else if (object instanceof UserType) {
-            PolyStringType userFullName = ((UserType) object).getFullName();
-            if (userFullName != null && !userFullName.isEmpty()) {
-                return userFullName.plus(" (").plus(object.getName()).plus(")");
-            } else {
-                return object.getName();
-            }
+            return ((UserType) object).getFullName();
         } else {
             return null;
         }