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

Moved check for content to be done on commit.

Browse Source
This commit is contained in:
Roxana Lucanu-Ghetu
2016-06-06 10:25:46 +03:00
parent c6c9edf306
commit 3d74c81abc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,11 +215,6 @@ public class RecordFolderType extends AbstractDisposableItem
if (nodeService.exists(nodeRef)) if (nodeService.exists(nodeRef))
{ {
// only records can be added in a record folder
if (!instanceOf(nodeRef, ContentModel.TYPE_CONTENT))
{
throw new AlfrescoRuntimeException("Operation failed, because you can only place content into a record folder.");
}
// ensure nothing is being added to a closed record folder // ensure nothing is being added to a closed record folder
NodeRef recordFolder = childAssocRef.getParentRef(); NodeRef recordFolder = childAssocRef.getParentRef();
Boolean isClosed = (Boolean) nodeService.getProperty(recordFolder, PROP_IS_CLOSED); Boolean isClosed = (Boolean) nodeService.getProperty(recordFolder, PROP_IS_CLOSED);
@@ -245,6 +240,12 @@ public class RecordFolderType extends AbstractDisposableItem
{ {
final NodeRef recordFolder = childAssocRef.getChildRef(); final NodeRef recordFolder = childAssocRef.getChildRef();
// only records can be added in a record folder or hidden folders(is the case of e-mail attachments)
if (!instanceOf(recordFolder, ContentModel.TYPE_CONTENT) && !nodeService.hasAspect(recordFolder, ContentModel.ASPECT_HIDDEN))
{
throw new AlfrescoRuntimeException("Operation failed, because you can only place content into a record folder.");
}
behaviourFilter.disableBehaviour(); behaviourFilter.disableBehaviour();
try try
{ {