diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties index 0b6afb5298..a669cf8351 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties @@ -132,3 +132,6 @@ rm.enableAutoVersionOnRecordCreation=false # Metadata Extraction # content.metadata.async.extract.6.enabled=false + +# Max number of entries returned in Record search view +rm.recordSearch.maxItems=500 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 3d46d6a87a..2b23c08a65 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -14,6 +14,15 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> + + + + + ${rm.recordSearch.maxItems} + + + @@ -346,6 +355,7 @@ + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java index 511c6afeaa..38600df7d9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java @@ -87,7 +87,7 @@ public class RecordsManagementSearchParameters private static final List DEFAULT_INCLUDED_CONTAINER_TYPES = Collections.emptyList(); /** Max items */ - private int maxItems = 500; + private int maxItems; private boolean includeRecords = true; private boolean includeUndeclaredRecords = false; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java index c7c94bb96b..80343f07c5 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java @@ -93,6 +93,11 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear /** List of report details */ private List reports = new ArrayList<>(13); + /** + * Records Search Parameters + */ + private RecordsManagementSearchParameters recordsManagementSearchParameters; + /** * @param fileFolderService file folder service */ @@ -176,14 +181,13 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear } } - RecordsManagementSearchParameters searchParameters = new RecordsManagementSearchParameters(); if (report.has("searchparams")) { - searchParameters = RecordsManagementSearchParameters.createFromJSON(report.getJSONObject("searchparams"), namespaceService); + recordsManagementSearchParameters = RecordsManagementSearchParameters.createFromJSON(report.getJSONObject("searchparams"), namespaceService); } // Create the report details and add to list - ReportDetails reportDetails = new ReportDetails(name, description, query, searchParameters); + ReportDetails reportDetails = new ReportDetails(name, description, query, recordsManagementSearchParameters); reports.add(reportDetails); } } @@ -193,6 +197,16 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear } } + /** + * Set RecordsManagementSearchParameters service + * + * @param recordsManagementSearchParameters + */ + public void setRecordsManagementSearchParameters(RecordsManagementSearchParameters recordsManagementSearchParameters) + { + this.recordsManagementSearchParameters = recordsManagementSearchParameters; + } + /** * @see org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService#search(java.lang.String, java.lang.String, org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchParameters) */ @@ -213,7 +227,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear searchParameters.setQuery(fullQuery.toString()); searchParameters.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO); searchParameters.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); - searchParameters.setMaxItems(rmSearchParameters.getMaxItems()); + searchParameters.setMaxItems(recordsManagementSearchParameters.getMaxItems()); searchParameters.setNamespace(RecordsManagementModel.RM_URI); // set sort