mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-2937 - The destruction of records can not be completed if the metadata is set to be maintained after destruction.
- removed nodeService and eagerContentStoreCleaner from rm.contentDestructionComponent bean as they are already set on contentDestructionComponent - fixed the ignored boolean
This commit is contained in:
@@ -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();
|
||||||
|
Reference in New Issue
Block a user