Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Oct 10, 2023 · 56ae835 · 56ae835
2 parents 7bbd585 + efc1583
commit 56ae835
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -925,7 +925,7 @@ private void recomputeMembersPerformed(IModel<?> rowModel, AjaxRequestTarget tar
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected IModel<String> getWarningMessageModel() {
+            protected IModel<String> createWarningMessageModel() {
                 if (isSubtreeScope()) {
                     return createStringResource("abstractRoleMemberPanel.recompute.warning.subtree");
                 }
@@ -1134,7 +1134,7 @@ private void showConfirmDialog(
         ConfirmationPanel dialog = new ConfigureTaskConfirmationPanel(getPageBase().getMainPopupBodyId(), confirmModel) {
 
             @Override
-            protected IModel<String> getWarningMessageModel() {
+            protected IModel<String> createWarningMessageModel() {
                 if (isSubtreeScope() && rowModel == null) {
                     return createStringResource("abstractRoleMemberPanel.unassign.warning.subtree");
                 } else if (isIndirect() && rowModel == null) {

diff --git a/...impl/page/admin/resource/component/wizard/objectType/synchronization/ActionStepPanel.java b/...impl/page/admin/resource/component/wizard/objectType/synchronization/ActionStepPanel.java
@@ -164,6 +164,7 @@ protected void onInitialize() {
                 if (parent != null) {
                     parent.add(AttributeAppender.replace("class", "pt-0 pb-3 px-3 mb-0"));
                 }
+                get(ID_VALUE_FORM).add(AttributeAppender.remove("class"));
             }
         };
         panel.setOutputMarkupId(true);

diff --git a/.../main/java/com/evolveum/midpoint/web/component/dialog/ConfigureTaskConfirmationPanel.java b/.../main/java/com/evolveum/midpoint/web/component/dialog/ConfigureTaskConfirmationPanel.java
@@ -33,12 +33,20 @@ public ConfigureTaskConfirmationPanel(String id) {
 
     }
 
+    private final IModel<String> warningMessageModel;
+
     public ConfigureTaskConfirmationPanel(String id, IModel<String> message) {
         super(id, message);
+        warningMessageModel = createWarningMessageModel();
+    }
+
+    @Override
+    protected void onInitialize() {
+        super.onInitialize();
 
-        MessagePanel<?> warningMessage = new MessagePanel<>("warnningMessage", MessagePanel.MessagePanelType.WARN, getWarningMessageModel());
+        MessagePanel<?> warningMessage = new MessagePanel<>("warnningMessage", MessagePanel.MessagePanelType.WARN, warningMessageModel);
         warningMessage.setOutputMarkupId(true);
-        warningMessage.add(new VisibleBehaviour(() -> getWarningMessageModel() != null));
+        warningMessage.add(new VisibleBehaviour(() -> warningMessageModel != null));
         add(warningMessage);
     }
 
@@ -64,7 +72,7 @@ protected PrismObject<TaskType> createTask(AjaxRequestTarget target) {
         return null;
     }
 
-    protected IModel<String> getWarningMessageModel() {
+    protected IModel<String> createWarningMessageModel() {
         return null;
     }
 

diff --git a/pom.xml b/pom.xml
@@ -994,7 +994,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.7-M2</version>
+                <version>3.7</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
@@ -12,7 +12,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.7-M2</connectorVersion>
+    <connectorVersion>3.7</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>