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

Evolveum · Feb 1, 2021 · a0b4bd6 · a0b4bd6
2 parents 9e7d11c + 37b6a14
commit a0b4bd6
Show file tree

Hide file tree

Showing 63 changed files with 2,527 additions and 346 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
@@ -133,20 +133,15 @@ public class PageAuditLogDetails extends PageBase {
                     WorkflowConstants.AUDIT_WORK_ITEM_ID,
                     WorkflowConstants.AUDIT_PROCESS_INSTANCE_ID);
 
-    public PageAuditLogDetails() {
-        AuditLogStorage storage = getSessionStorage().getAuditLog();
-        initModel(storage.getAuditRecord());
-    }
-
     public PageAuditLogDetails(PageParameters params) {
         if (params != null) {
             getPageParameters().overwriteWith(params);
         }
-        initAuditModel();
+        initAuditLogModel(getSessionStorage().getAuditLog().getAuditRecord());
     }
 
     public PageAuditLogDetails(AuditEventRecordType record) {
-        initModel(record);
+        initAuditLogModel(record);
     }
 
     @Override
@@ -156,13 +151,11 @@ protected void onInitialize() {
 
     }
 
-    private void initModel(AuditEventRecordType record) {
+    private void initAuditLogModel(AuditEventRecordType record) {
         recordModel = new LoadableModel<AuditEventRecordType>(false) {
 
             @Override
             protected AuditEventRecordType load() {
-                AuditLogStorage storage = getSessionStorage().getAuditLog();
-                storage.setAuditRecord(record);
                 return record;
             }
         };

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
@@ -417,6 +417,7 @@ public void onClick(IModel<SelectableBean<AuditEventRecordType>> rowModel) {
                 } catch (SchemaException e) {
                     throw new SystemException("Couldn't adopt event record: " + e, e);
                 }
+                getAuditLogViewerStorage().setAuditRecord(record);
                 getPageBase().navigateToNext(new PageAuditLogDetails(record));
             }
         };

diff --git a/pom.xml b/pom.xml
@@ -910,7 +910,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>3.1</version>
+                <version>3.2-M1</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</connectorVersion>
+    <connectorVersion>3.1-M1</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>

diff --git a/repo/repo-sqale/sql/optional-codes.sql b/repo/repo-sqale/sql/optional-codes.sql
@@ -1,4 +1,6 @@
 -- @formatter:off
+-- This is incorporated into new repo with m_* prefix, this c_* version is better for old repo.
+
 -- Describes c_object.objectClassType
 CREATE TABLE c_objtype (
     id INT PRIMARY KEY,