inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonsJavaApiTests' into feature/RM-4707_Classification_Reason_CRUD_REST_API

Browse Source 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
This commit is contained in:
Tuna Aksoy
2017-08-04 15:09:02 +01:00
parent f957a60a5c bae4d0c394
commit 642e8b2ac8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java
View File

@@ -268,6 +268,11 @@ public class RecordFolderType extends AbstractDisposableItem
{
final NodeRef child = childAssocRef.getChildRef();
if(!nodeService.exists(child))
{
return;
}
// only records can be added in a record folder or hidden folders(is the case of e-mail attachments)
if (instanceOf(child, ContentModel.TYPE_FOLDER) && !nodeService.hasAspect(child, ContentModel.ASPECT_HIDDEN))
{