CSPACE-5492: Fixed a problem in the XML schema related to the definition of the refna...

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
index d611aa0a1feca4f3f4709b02fe5eece33608c46b..48b8b06f729815d1a96495cee5e7124e5dcdbef9 100644 (file)
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
@@ -133,6 +133,7 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon>
                        ctx.getServiceName(),
                        shortIdentifier,
                        displayName);
+               refname = authority;
        } catch (Exception e) {
                logger.error(e.getMessage(), e);
        }

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index d3f151e0ffc5a34e1b47049a420bfa6e5846385e..65b346ccc06f484d96cc924285974c6bf34ed687 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -88,11 +88,9 @@
             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
                 <service:params>
                        <service:SupportsHierarchy>false</service:SupportsHierarchy>
-                       <service:RefnameDisplayNameField>
-                        <service:ListResultField>
-                            <service:element>objectNumber</service:element>
-                            <service:xpath>objectNumber</service:xpath>
-                        </service:ListResultField>
+                       <service:RefnameDisplayNameField> <!-- The field used as the display name in an object's refname -->
+                           <service:element>objectNumber</service:element>
+                           <service:xpath>objectNumber</service:xpath>
                        </service:RefnameDisplayNameField>
                     <service:ListResultsFields>
                         <service:ListResultField>

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index ba58abf3035edebe535088746aef8588eae16bf7..7ac8b2c877e992d78d6ef8bfbb2c32b6d5ac0b19 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -140,7 +140,7 @@ public abstract class   RemoteDocumentModelHandlerImpl<T, TL>
        return getRefnameDisplayName(docWrapper.getWrappedObject());
     }
        
-       private String getRefnameDisplayName(DocumentModel docModel) {
+       private String getRefnameDisplayName(DocumentModel docModel) { // Look in the tenant bindings to see what field should be our display name for our refname value
                String result = null;
                
        DocHandlerParams.Params params = null;