Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Mar 28, 2022 · c70e2d7 · c70e2d7
2 parents b9c2ee3 + 26d01da
commit c70e2d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
@@ -124,9 +124,13 @@ private void initMidpointAccountSelected() {
     private void initLayout() {
         WebMarkupContainer oldPasswordContainer = new WebMarkupContainer(ID_OLD_PASSWORD_CONTAINER);
         oldPasswordContainer.add(new VisibleEnableBehaviour() {
-
             private static final long serialVersionUID = 1L;
 
+            @Override
+            public boolean isEnabled() {
+                return canEditPassword();
+            }
+
             @Override
             public boolean isVisible() {
                 return isCheckOldPassword();
@@ -139,7 +143,6 @@ public boolean isVisible() {
         oldPasswordField.setRequired(false);
         oldPasswordField.setResetPassword(false);
         oldPasswordField.setOutputMarkupId(true);
-        oldPasswordContainer.add(new EnableBehaviour(this::canEditPassword));
         oldPasswordContainer.add(oldPasswordField);
 
         Label passwordLabel = new Label(ID_PASSWORD_LABEL, createStringResource("PageSelfCredentials.passwordLabel1"));

diff --git a/pom.xml b/pom.xml
@@ -914,7 +914,7 @@
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
                 <!-- Do not forget to update provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml when changing connector version. -->
-                <version>3.4-M1</version>
+                <version>3.4</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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2021 Evolveum and contributors
+  ~ Copyright (c) 2010-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -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.4-M1</connectorVersion>
+    <connectorVersion>3.4</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>