From c6b950ba2eb8a7e1c0ac7b267c5bff5a189e97ec Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:34:25 +0200 Subject: [PATCH 1/2] mark generated by script as false when creating new domain (#7162) --- .../orcid/persistence/dao/impl/ProfileEmailDomainDaoImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileEmailDomainDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileEmailDomainDaoImpl.java index 9a8bffd0b4e..c4482afb5bd 100644 --- a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileEmailDomainDaoImpl.java +++ b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileEmailDomainDaoImpl.java @@ -28,6 +28,7 @@ public ProfileEmailDomainEntity addEmailDomain(String orcid, String emailDomain, e.setEmailDomain(emailDomain); e.setOrcid(orcid); e.setVisibility(visibility); + e.setGeneratedByScript(false); entityManager.persist(e); return e; } From 5b00024b834aafd21c8ec9631c52891379623a33 Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 18 Dec 2024 19:47:12 +0000 Subject: [PATCH 2/2] v2.69.12 changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86508634023..335f1dcda76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.69.12 - 2024-12-18 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.69.11...v2.69.12) + ## v2.69.11 - 2024-12-18 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.69.10...v2.69.11)