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 release/2.4 into master

Browse Source
This commit is contained in:
Ana Bozianu
2016-02-26 11:00:00 +02:00
parent a3a956a35e 985c77ece6
commit 3125a6e4b3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponent.java
View File

@@ -168,8 +168,9 @@ public class ContentDestructionComponent
// We want to remove the rn:renditioned aspect, but due to the possibility // We want to remove the rn:renditioned aspect, but due to the possibility
// that there is Alfresco 3.2-era data with the cm:thumbnailed aspect // that there is Alfresco 3.2-era data with the cm:thumbnailed aspect
// applied, we must consider removing it too. // applied, we must consider removing it too.
if (getNodeService().hasAspect(nodeRef, RenditionModel.ASPECT_RENDITIONED) || if (includeRenditions
getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_THUMBNAILED)) && (getNodeService().hasAspect(nodeRef, RenditionModel.ASPECT_RENDITIONED)
|| getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_THUMBNAILED)))
{ {
// get the rendition assoc types // get the rendition assoc types
Set<QName> childAssocTypes = dictionaryService.getAspect(RenditionModel.ASPECT_RENDITIONED).getChildAssociations().keySet(); Set<QName> childAssocTypes = dictionaryService.getAspect(RenditionModel.ASPECT_RENDITIONED).getChildAssociations().keySet();
@@ -179,6 +180,9 @@ public class ContentDestructionComponent
{ {
// destroy renditions content // destroy renditions content
destroyContent(child.getChildRef(), false); destroyContent(child.getChildRef(), false);
//delete the rendition node
getNodeService().deleteNode(child.getChildRef());
} }
} }
} }