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

Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)

Browse Source 
120041 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119608 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn’t work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-12-14 12:08:27 +00:00
parent fcc7d9bb1e
commit 1f479a1c88
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
View File

@@ -1490,26 +1490,48 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
// Store
if (!childStore.getId().equals(newParentStore.getId()))
{
// Remove the cm:auditable aspect from the source node
// Remove the cm:auditable aspect from the old node as the new one will get new values as required
Set<Long> aspectIdsToDelete = qnameDAO.convertQNamesToIds(
Collections.singleton(ContentModel.ASPECT_AUDITABLE),
true);
deleteNodeAspects(childNodeId, aspectIdsToDelete);
// ... but make sure we copy over the cm:auditable data from the originating node
AuditablePropertiesEntity auditableProps = childNode.getAuditableProperties();
// Create a new node and copy all the data over to it
// Create a new node
newChildNode = newNodeImpl(
newParentStore,
childNode.getUuid(),
childNode.getTypeQNameId(),
childNode.getLocaleId(),
childNode.getAclId(),
auditableProps);
null);
Long newChildNodeId = newChildNode.getId();
moveNodeData(
childNode.getId(),
newChildNodeId);
QName nodeTypeQName = qnameDAO.getQName(childNode.getTypeQNameId()).getSecond();
boolean isAuditable = AuditablePropertiesEntity.hasAuditableAspect(nodeTypeQName, dictionaryService);
AuditablePropertiesEntity auditableProps = null;
if (isAuditable)
{
//Delete the ASPECT_AUDITABLE from the source node so it doesn't get copied across
//A new aspect would have already been created in the newNodeImpl method.
// ... make sure we have the cm:auditable data from the originating node
auditableProps = childNode.getAuditableProperties();
Set<Long> aspectIdsToDelete = qnameDAO.convertQNamesToIds(
Collections.singleton(ContentModel.ASPECT_AUDITABLE),
true);
deleteNodeAspects(childNodeId, aspectIdsToDelete);
}
//copy all the data over to new node
moveNodeData(childNode.getId(), newChildNodeId);
if (isAuditable && auditableProps != null)
{
Node node = getNodeNotNull(newChildNodeId, false);
NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
nodeUpdate.setId(newChildNodeId);
nodeUpdate.setAuditableProperties(auditableProps);
nodeUpdate.setUpdateAuditableProperties(true);
nodeUpdate.setVersion(node.getVersion());
updateNode(nodeUpdate);
}
// The new node will have new data not present in the cache, yet
invalidateNodeCaches(newChildNodeId);
invalidateNodeChildrenCaches(newChildNodeId, true, true);