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

RM-5115 Get category children REST API disposition schedule fix

Browse Source
This commit is contained in:
Sara Aspery
2017-05-09 14:34:08 +01:00
parent dd89f9864c
commit 9627b8ff70
3 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java
View File

@@ -29,6 +29,7 @@ package org.alfresco.rm.rest.api.impl;
import java.security.InvalidParameterException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -198,6 +199,7 @@ public class SearchTypesFactory
Boolean isRecordFolder = propertyWalker.getProperty(RecordCategoryChild.PARAM_IS_RECORD_FOLDER,
WhereClauseParser.EQUALS, Boolean.class);
Boolean isRecordCategory = propertyWalker.getProperty(RecordCategoryChild.PARAM_IS_RECORD_CATEGORY, WhereClauseParser.EQUALS, Boolean.class);
if ((isRecordFolder != null && isRecordFolder.booleanValue()) || (isRecordCategory != null && !isRecordCategory.booleanValue()))
{
includeRecordFolders = true;
@@ -221,6 +223,7 @@ public class SearchTypesFactory
if (nodeTypeQNameStr.equals(RecordsManagementModel.TYPE_RECORD_FOLDER))
{
includeRecordFolders = true;
}
else if (filterNodeTypeQName.equals(RecordsManagementModel.TYPE_RECORD_CATEGORY))
{
@@ -249,6 +252,16 @@ public class SearchTypesFactory
return searchTypeQNames;
}
/**
* Helper method to build association types for categories endpoint
* @return
*/
public Set<QName> buildAssocTypesCategoriesEndpoint()
{
Set<QName> assocTypeQNames = Collections.singleton(ContentModel.ASSOC_CONTAINS);
return assocTypeQNames;
}
/**
* Helper method to build search types for transfer containers endpoint
* @return

3
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/recordcategories/RecordCategoryChildrenRelation.java
View File

@@ -114,10 +114,11 @@ public class RecordCategoryChildrenRelation implements RelationshipResourceActio
// list record categories and record folders
Set<QName> searchTypeQNames = searchTypesFactory.buildSearchTypesCategoriesEndpoint(parameters, LIST_RECORD_CATEGORY_CHILDREN_EQUALS_QUERY_PROPERTIES);
Set<QName> assocTypeQNames = searchTypesFactory.buildAssocTypesCategoriesEndpoint();
List<FilterProp> filterProps = apiUtils.getListChildrenFilterProps(parameters, LIST_RECORD_CATEGORY_CHILDREN_EQUALS_QUERY_PROPERTIES);
final PagingResults<FileInfo> pagingResults = fileFolderService.list(parentNodeRef,
null,
assocTypeQNames,
searchTypeQNames,
null,
apiUtils.getSortProperties(parameters),