CB-20: Use controlled object name in computed title (#374)

diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java
index bf9ffbbaac2beb14c06814e749a17981636f43cc..d589273bfd21ced1f92125ecfe772cab509b7595 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java
+++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java
@@ -212,7 +212,10 @@ private void denormExhibitionRecords(CoreSession session, String csid, String te
 
                if (objectNameGroups.size() > 0) {
                        Map<String, Object> primaryObjectNameGroup = objectNameGroups.get(0);
-                       primaryObjectName = (String) primaryObjectNameGroup.get("objectName");
+                       primaryObjectName = (String) primaryObjectNameGroup.get("objectNameControlled");
+                       if (primaryObjectName == null) {
+                               primaryObjectName = (String) primaryObjectNameGroup.get("objectName");
+                       }
 
                        // The object might be a refname in some profiles/tenants. If it is, use only the display name.