inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
130515 gjames: SEARCH-168, Fixed search api parameters so include and fields work together


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:10:55 +00:00
parent 6db87e1e5a
commit b9a0163399
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/rest/api/search/SearchApiWebscript.java
View File

@@ -51,7 +51,9 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.WebScriptResponse;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* An implementation of the {{baseUrl}}/{{networkId}}/public/search/versions/1/search endpoint * An implementation of the {{baseUrl}}/{{networkId}}/public/search/versions/1/search endpoint
@@ -123,7 +125,13 @@ public class SearchApiWebscript extends AbstractWebScript implements RecognizedP
BeanPropertiesFilter filter = null; BeanPropertiesFilter filter = null;
if (searchQuery.getFields()!= null && !searchQuery.getFields().isEmpty()) if (searchQuery.getFields()!= null && !searchQuery.getFields().isEmpty())
{ {
filter = getFilter("", searchQuery.getFields()); List<String> selectList = new ArrayList<>(searchQuery.getFields().size());
selectList.addAll(searchQuery.getFields());
if (searchQuery.getInclude()!= null && !searchQuery.getInclude().isEmpty())
{
selectList.addAll(searchQuery.getInclude());
}
filter = getFilter("", selectList);
} }
Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, filter, null, null, null, null, null, false); Params.RecognizedParams recognizedParams = new Params.RecognizedParams(null, null, filter, null, null, null, null, null, false);
return Params.valueOf(null, recognizedParams, searchQuery, webScriptRequest); return Params.valueOf(null, recognizedParams, searchQuery, webScriptRequest);