CSPACE-5733: Emit authority records from servicegroups queries.

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 0795796353b6fce14602136238a8ff084b00b560..2d59ce237eb7921b9c83669004bd7678764daa9c 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
@@ -1577,6 +1577,16 @@
                     </service:field>
                 </service:params>
             </service:initHandler>
+            <service:properties xmlns:service="http://collectionspace.org/services/config/service">
+                <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                    <types:key>objectNameProperty</types:key>
+                    <types:value>displayName</types:value>
+                </types:item>
+                <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                    <types:key>objectNumberProperty</types:key>
+                    <types:value>shortIdentifier</types:value>
+                </types:item>
+            </service:properties>
             <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Vocabularyitem" version="0.1">
                 <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="vocabularyitems-system" updated="" order="0">
                     <service:content contentType="application/xml">

diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
index 8caa93dce9d8d7de87a62672b25bb24f710d3e4b..14cf99225bbd54e5bd295fe3944bf9ba3c394753 100644 (file)
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/ServiceGroupResource.java
@@ -173,7 +173,7 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
             // We need to get all the procedures, authorities, and objects.
                ArrayList<String> groupsList = null;  
                if("common".equalsIgnoreCase(groupname)) {
-                       groupsList = ServiceBindingUtils.getCommonServiceTypes(EXCLUDE_AUTHORITIES); // CSPACE-5359: Excluding Authority type to stay backward compat with v2.4
+                       groupsList = ServiceBindingUtils.getCommonServiceTypes(INCLUDE_AUTHORITIES);
                } else {
                        groupsList = new ArrayList<String>();
                        groupsList.add(groupname);
@@ -227,7 +227,7 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
                                                createDocumentHandler(ctx);
                ArrayList<String> groupsList = null;  
                if("common".equalsIgnoreCase(serviceGroupName)) {
-                       groupsList = ServiceBindingUtils.getCommonServiceTypes(EXCLUDE_AUTHORITIES); //CSPACE-5359: Exclude authorities to remain backward compat with v2.4
+                       groupsList = ServiceBindingUtils.getCommonServiceTypes(INCLUDE_AUTHORITIES);
                } else {
                        groupsList = new ArrayList<String>();
                        groupsList.add(serviceGroupName);