Merge remote-tracking branch 'origin/master'

Evolveum · Oct 22, 2020 · 5026b2b · 5026b2b
2 parents 3385219 + 933a8cf
commit 5026b2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
@@ -8,12 +8,16 @@
 
 import java.io.Serializable;
 
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-
-import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
+
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.ItemDefinition;
+import com.evolveum.midpoint.prism.path.ItemPath;
+
+import org.apache.wicket.model.StringResourceModel;
 
 /**
  * @author Viliam Repan (lazyman)
@@ -39,6 +43,9 @@ public ItemDefinition getDefinition() {
     }
 
     public String getName() {
+        if (definition != null && StringUtils.isNotEmpty(definition.getDisplayName())) {
+            return PageBase.createStringResourceStatic(null, definition.getDisplayName()).getString();
+        }
         return WebComponentUtil.getItemDefinitionDisplayNameOrName(definition, null);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -874,7 +874,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>3.1-M3</version>
+                <version>3.1</version>
                 <exclusions>
                     <!-- Needed otherwise the JDK14 SLF4J binding can override the midpoint's logback binding -->
                     <exclusion>

diff --git a/provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml b/provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml
@@ -14,7 +14,7 @@
     <name>ICF com.evolveum.polygon.connector.ldap.LdapConnector</name>
     <framework>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1</framework>
     <connectorType>com.evolveum.polygon.connector.ldap.LdapConnector</connectorType>
-    <connectorVersion>3.1-M3</connectorVersion>
+    <connectorVersion>3.1</connectorVersion>
     <connectorBundle>com.evolveum.polygon.connector-ldap</connectorBundle>
     <namespace>http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector</namespace>
     <schema>