diff --git a/CHANGELOG.md b/CHANGELOG.md index ee2762a9877..7798705c8c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +## v2.42.0 - 2023-10-11 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.41.2...v2.42.0) + +## v2.41.2 - 2023-10-11 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.41.1...v2.41.2) + +- [#6901](https://github.com/ORCID/ORCID-Source/pull/6901): URL comparison should be case sensitive + +## v2.41.1 - 2023-10-11 + +[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.41.0...v2.41.1) + +- [#6903](https://github.com/ORCID/ORCID-Source/pull/6903): fix: Only compare assertion origin orcid in obo + +### Fix + +- Only compare assertion origin orcid in obo + ## v2.41.0 - 2023-10-04 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.40.5...v2.41.0) diff --git a/orcid-core/src/main/java/org/orcid/core/utils/v3/SourceUtils.java b/orcid-core/src/main/java/org/orcid/core/utils/v3/SourceUtils.java index a2eeb5af8f1..04f10cac2bc 100644 --- a/orcid-core/src/main/java/org/orcid/core/utils/v3/SourceUtils.java +++ b/orcid-core/src/main/java/org/orcid/core/utils/v3/SourceUtils.java @@ -311,9 +311,12 @@ public void setSourceName(ResearchResources rr) { public static boolean isSelfAsserted(Source source, String orcid) { String sourceId = source.retrieveSourcePath(); - String assertionOriginSourceId = source.retrieveAssertionOriginPath(); + String assertionOriginOrcid = null; + if (source.getAssertionOriginOrcid() != null && source.getAssertionOriginOrcid().getPath() != null) { + assertionOriginOrcid = source.getAssertionOriginOrcid().getPath(); + } // If the affiliation source is the user himself or any member with OBO, then, it is considered self asserted - if(orcid.equals(sourceId) || orcid.equals(assertionOriginSourceId)) { + if(orcid.equals(sourceId) || orcid.equals(assertionOriginOrcid)) { return false; } else { return true; diff --git a/orcid-core/src/main/java/org/orcid/pojo/ajaxForm/WebsiteForm.java b/orcid-core/src/main/java/org/orcid/pojo/ajaxForm/WebsiteForm.java index 8f5b45c7bf2..52e64bc9cfa 100644 --- a/orcid-core/src/main/java/org/orcid/pojo/ajaxForm/WebsiteForm.java +++ b/orcid-core/src/main/java/org/orcid/pojo/ajaxForm/WebsiteForm.java @@ -223,7 +223,7 @@ public boolean compare(Object obj) { return false; WebsiteForm other = (WebsiteForm) obj; - if (!WorkForm.compareTexts(url, other.getUrl(), true)) + if (!WorkForm.compareTexts(url, other.getUrl(), false)) return false; if (!WorkForm.compareStrings(urlName, other.getUrlName())) return false;