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

Evolveum · Mar 29, 2023 · 4889c5a · 4889c5a
2 parents 18ccae1 + c06ebb8
commit 4889c5a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/config/sql/native-new/postgres-new-audit.sql b/config/sql/native-new/postgres-new-audit.sql
@@ -248,7 +248,7 @@ BEGIN
         END IF;
         COMMIT;
     ELSE
-        RAISE NOTICE 'Audit change #% skipped, last change #% is newer!', changeNumber, lastChange;
+        RAISE NOTICE 'Audit change #% skipped - not newer than the last change #%!', changeNumber, lastChange;
     END IF;
 END $$;
 -- endregion

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
@@ -5709,14 +5709,14 @@ private static void createToastForObject(String key, QName type, AjaxRequestTarg
                 .success()
                 .title(PageBase.createStringResourceStatic(
                                 key,
-                                translateMessage(ObjectTypeUtil.createTypeDisplayInformation(type, true)))
+                                (Object) translateMessage(ObjectTypeUtil.createTypeDisplayInformation(type, true)))
                         .getString())
                 .icon("fas fa-circle-check")
                 .autohide(true)
                 .delay(5_000)
                 .body(PageBase.createStringResourceStatic(
                                 key + ".text",
-                                translateMessage(ObjectTypeUtil.createTypeDisplayInformation(type, false)))
+                                (Object) translateMessage(ObjectTypeUtil.createTypeDisplayInformation(type, false)))
                         .getString())
                 .show(target);
     }

diff --git a/...mpl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java b/...mpl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
@@ -793,7 +793,9 @@ protected SearchResultList<PrismObject<AccessCertificationCampaignType>> getAllC
         return repositoryService.searchObjects(AccessCertificationCampaignType.class, null, null, result);
     }
 
-    int currentYear() {
-        return Year.now().getValue();
+    String currentYearFragment() {
+        // In some environments, the date format does not contain "2023" but only "23".
+        return String.valueOf(
+                (Year.now().getValue() % 100));
     }
 }
diff --git a/...n-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java b/...n-impl/src/test/java/com/evolveum/midpoint/certification/test/TestCertificationBasic.java
@@ -841,7 +841,7 @@ public void test220CreateReports() throws Exception {
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
-        String year = String.valueOf(currentYear());
+        String year = currentYearFragment();
 
         var definitions = REPORT_CERTIFICATION_DEFINITIONS.export()
                 .execute(result);

diff --git a/...ification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java b/...ification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestEscalation.java
@@ -476,7 +476,7 @@ public void test210Reports() throws Exception {
 
         login(getUserFromRepo(USER_ADMINISTRATOR_OID));
 
-        String year = String.valueOf(currentYear());
+        String year = currentYearFragment();
         String definitionName = "Basic User Assignment Certification (ERoot only) with escalations";
         String campaignName = definitionName + " 1";