From 26a1e7b69fba45b5bb51a2c51379353a3f798349 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 6 Sep 2016 14:44:20 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 129886 jvonka: REPO-1090: fix regress (V1 REST API - list children within the context of a smart folder) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/impl/NodesImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java index cdc815665c..21f516c45d 100644 --- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java +++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java @@ -1328,8 +1328,16 @@ public class NodesImpl implements Nodes Set assocTypeQNames = buildAssocTypes(assocTypeQNameParam); // call GetChildrenCannedQuery (via FileFolderService) - pagingResults = fileFolderService.list(parentNodeRef, assocTypeQNames, searchTypeQNames, ignoreAspectQNames, sortProps, filterProps, pagingRequest); - + if (((filterProps == null) || (filterProps.size() == 0)) && + ((assocTypeQNames == null) || (assocTypeQNames.size() == 0))) + { + pagingResults = fileFolderService.list(parentNodeRef, searchTypeQNames, ignoreAspectQNames, sortProps, pagingRequest); + } + else + { + // TODO smart folders (see REPO-1173) + pagingResults = fileFolderService.list(parentNodeRef, assocTypeQNames, searchTypeQNames, ignoreAspectQNames, sortProps, filterProps, pagingRequest); + } final Map mapUserInfo = new HashMap<>(10);