Merge branch 'main' of https://github.com/ORCID/ORCID-Source

ORCID · Jul 4, 2024 · ddf3e67 · ddf3e67
2 parents cff8029 + 74f285d
commit ddf3e67
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 2,613 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.61.5 - 2024-07-03
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.61.4...v2.61.5)
+
 ## v2.61.4 - 2024-07-01
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.61.3...v2.61.4)

diff --git a/orcid-core/src/main/java/org/orcid/core/manager/impl/OrgDisambiguatedManagerImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/impl/OrgDisambiguatedManagerImpl.java
@@ -159,7 +159,7 @@ private OrgDisambiguatedSolrDocument convertEntityToDocument(OrgDisambiguatedEnt
         }
 
         if(entity.getNamesJson() != null) {
-            document.setOrgLocationsJson(entity.getNamesJson());
+            document.setOrgNamesJson(entity.getNamesJson());
         }
 
         List<OrgEntity> orgs = orgDao.findByOrgDisambiguatedId(entity.getId());