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

ALF-10717: Renditions doclib and webpreview accumulates (not replaced) when creating new version using Edit Offline

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2011-11-21 04:56:09 +00:00
parent e227186d72
commit 175e8a7420
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/repo/rendition/RenditionedAspect.java
View File

@@ -49,6 +49,7 @@ import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper; import org.alfresco.util.EqualsHelper;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -326,14 +327,35 @@ public class RenditionedAspect implements NodeServicePolicies.OnUpdateProperties
{ {
private static final CopyBehaviourCallback INSTANCE = new RenditionedAspectCopyBehaviourCallback(); private static final CopyBehaviourCallback INSTANCE = new RenditionedAspectCopyBehaviourCallback();
/** /**
* We do not copy the {@link RenditionModel#ASPECT_RENDITIONED rn:renditioned} aspect. * We do not copy the {@link RenditionModel#ASPECT_RENDITIONED rn:renditioned} aspect.
*/ */
@Override @Override
public boolean getMustCopy(QName classQName, CopyDetails copyDetails) public boolean getMustCopy(QName classQName, CopyDetails copyDetails)
{ {
// Prevent the copying of the renditioned aspect only. return false;
return (! RenditionModel.ASPECT_RENDITIONED.equals(classQName)); }
@Override
public Pair<AssocCopySourceAction, AssocCopyTargetAction> getAssociationCopyAction(
QName classQName,
CopyDetails copyDetails,
CopyAssociationDetails assocCopyDetails)
{
return new Pair<AssocCopySourceAction, AssocCopyTargetAction>(
AssocCopySourceAction.IGNORE,
AssocCopyTargetAction.USE_COPIED_OTHERWISE_ORIGINAL_TARGET);
}
@Override
public ChildAssocCopyAction getChildAssociationCopyAction(
QName classQName,
CopyDetails copyDetails,
CopyChildAssociationDetails childAssocCopyDetails)
{
return ChildAssocCopyAction.IGNORE;
} }
} }
} }