From 06a9ace67d43f0ea4c91de91dff3300853fd2ee9 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Thu, 6 Oct 2016 19:58:33 +0300 Subject: [PATCH] RM-4012 - removed special containers and disposition schedules from the result list --- .../org/alfresco/rest/api/impl/RMNodesImpl.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rest/api/impl/RMNodesImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/rest/api/impl/RMNodesImpl.java index 5a58216a20..1adcf94063 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rest/api/impl/RMNodesImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rest/api/impl/RMNodesImpl.java @@ -30,6 +30,7 @@ package org.alfresco.rest.api.impl; import java.io.Serializable; import java.util.List; import java.util.Map; +import java.util.Set; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; @@ -48,6 +49,7 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; +import org.alfresco.util.Pair; /** * Centralizes access to the repository. @@ -244,4 +246,19 @@ public class RMNodesImpl extends NodesImpl return null; // unknown } + + @Override + protected Pair, Set> buildSearchTypesAndIgnoreAspects(QName nodeTypeQName, boolean includeSubTypes, Set ignoreQNameTypes, Boolean includeFiles, Boolean includeFolders) + { + Pair, Set> searchTypesAndIgnoreAspects = super.buildSearchTypesAndIgnoreAspects(nodeTypeQName, includeSubTypes, ignoreQNameTypes, includeFiles, includeFolders); + Set searchTypeQNames = searchTypesAndIgnoreAspects.getFirst(); + Set ignoreAspectQNames = searchTypesAndIgnoreAspects.getSecond(); + + searchTypeQNames.remove(RecordsManagementModel.TYPE_HOLD_CONTAINER); + searchTypeQNames.remove(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER); + searchTypeQNames.remove(RecordsManagementModel.TYPE_TRANSFER_CONTAINER); + searchTypeQNames.remove(RecordsManagementModel.TYPE_DISPOSITION_SCHEDULE); + + return new Pair<>(searchTypeQNames, ignoreAspectQNames); + } }