CSPACE-4875 Fixed bug that would include soft-deleted objects in search all.

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 61ced7e466286f3ab7581e978962f2555bc5e039..db56e8c3bc27a26d752146bf8a14250f4d0edc28 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
@@ -1151,6 +1151,10 @@
               <service:element>title</service:element>
               <service:xpath>title</service:xpath>
             </service:ListResultField>
+            <service:ListResultField>
+              <service:element>owner</service:element>
+              <service:xpath>owner</service:xpath>
+            </service:ListResultField>
           </service:ListResultsFields>
         </service:params>
       </service:DocHandlerParams>
@@ -1160,6 +1164,10 @@
           <types:key>objectNameProperty</types:key>
           <types:value>title</types:value>
         </types:item>
+                               <types:item xmlns:types="http://collectionspace.org/services/common/types">
+                                               <types:key>objectNumberProperty</types:key>
+                                               <types:value>title</types:value>
+                               </types:item>
       </service:properties>
       <service:object xmlns:service="http://collectionspace.org/services/common/service" name="Group" version="0.1">
         <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="group-system" updated="" order="0">

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 9b66ad51ef3f2a688ebf54ae54cab4a73662b053..2bb8aa96adf7aeab734713cbcb82cc9f001bff4d 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -471,7 +471,6 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
                         "The findDocs() method must specify at least one DocumentType.");
             }
             DocumentModelList docList = null;
-            // force limit to 1, and ignore totalSize
             QueryContext queryContext = new QueryContext(ctx, whereClause);
             String query = NuxeoUtils.buildNXQLQuery(docTypes, queryContext);
             if (logger.isDebugEnabled()) {

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 7f89309b7e0482e4da3d8dbfbaba38f5096858b5..dcd5ea3694679baa7ddfe4b49544832603b57b4b 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
@@ -221,7 +221,7 @@ public class ServiceGroupResource extends AbstractCollectionSpaceResourceImpl {
         try {
             MultivaluedMap<String, String> queryParams = ui.getQueryParameters();
             String keywords = queryParams.getFirst(IQueryManager.SEARCH_TYPE_KEYWORDS_KW);
-               ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
+            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(queryParams);
                ServiceGroupDocumentModelHandler handler = (ServiceGroupDocumentModelHandler)
                                                createDocumentHandler(ctx);
                ArrayList<String> groupsList = null;  

diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
index 6f6c2b9072160580655f7f70ad23cb4a4b44fb49..207321b810d1608b2ba050d4798bada0732632ba 100644 (file)
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
@@ -105,6 +105,8 @@ public class ServiceGroupDocumentModelHandler
                            }
                    }
                }
+               // Make sure we pick up workflow state, etc. 
+               whereClause = myFilter.getWhereClause();
                int pageSize = myFilter.getPageSize();
                int pageNum = myFilter.getStartPage();
                final boolean computeTotal = true;