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

SAIL-390 (SAIL-294): NodeDAO: Allow cm:auditable to be set

Browse Source 
- Allow cm:auditable properties to be set directly
                 behaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);        // Lasts for txn
                // Set the auditable properties explicitly
                auditableProps.put(ContentModel.PROP_MODIFIER, "ThisUser");
                nodeService.addProperties(nodeRef, auditableProps);



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-07-14 18:18:32 +00:00
parent 75c6e063c2
commit 136dc70f9d
3 changed files with 92 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1154,9 +1154,20 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
/**
* Updates the node's transaction and <b>cm:auditable</b> properties only.
*
* @see #updateNodeImpl(NodeEntity, NodeUpdateEntity)
* @see #touchNodeImpl(Long, AuditablePropertiesEntity)
*/
private void touchNodeImpl(Long nodeId)
{
touchNodeImpl(nodeId, null);
}
/**
* Updates the node's transaction and <b>cm:auditable</b> properties only.
*
* @param auditableProps optionally override the <b>cm:auditable</b> values
*
* @see #updateNodeImpl(NodeEntity, NodeUpdateEntity)
*/
private void touchNodeImpl(Long nodeId, AuditablePropertiesEntity auditableProps)
{
Node node = null;
try
@@ -1171,6 +1182,10 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
}
NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
nodeUpdate.setId(nodeId);
if (auditableProps != null)
{
nodeUpdate.setAuditableProperties(auditableProps);
}
updateNodeImpl(node, nodeUpdate);
}
@@ -1247,11 +1262,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
nodeUpdate.setAuditableProperties(auditableProps);
nodeUpdate.setUpdateAuditableProperties(updateAuditableProperties);
}
else
else if (nodeUpdate.getAuditableProperties() == null)
{
// else: The auditable aspect is manual, so we expect the client code to have done
// the necessary updates on the 'nodeUpdate'
// cache the explicit setting of auditable properties when creating node (note: auditable aspect is not yet present)
AuditablePropertiesEntity auditableProps = oldNode.getAuditableProperties();
if (auditableProps != null)
@@ -1259,6 +1271,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
nodeUpdate.setAuditableProperties(auditableProps);
}
}
// else
// {
// // SAIL-390: NodeDAO: Allow cm:auditable to be set
// // The nodeUpdate had auditable properties set, so we just use that directly
// }
}
else
{
@@ -1577,6 +1594,15 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
Node node = getNodeNotNull(nodeId);
// Copy inbound values
newProps = new HashMap<QName, Serializable>(newProps);
// Copy cm:auditable
AuditablePropertiesEntity auditableProps = null;
if (!policyBehaviourFilter.isEnabled(node.getNodeRef(), ContentModel.ASPECT_AUDITABLE))
{
auditableProps = new AuditablePropertiesEntity();
auditableProps.setAuditValues(null, null, newProps);
}
// Remove cm:auditable
newProps.keySet().removeAll(AuditablePropertiesEntity.getAuditablePropertyQNames());
// Remove sys:referenceable
@@ -1694,12 +1720,6 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
}
}
// Shortcut if there are no diffs
if (propsToDelete.isEmpty() && propsToAdd.isEmpty())
{
return false;
}
// Remove by key
List<NodePropertyKey> propKeysToDeleteList = new ArrayList<NodePropertyKey>(propsToDelete.keySet());
deleteNodeProperties(nodeId, propKeysToDeleteList);
@@ -1738,8 +1758,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
}
// Update cache
setNodePropertiesCached(nodeId, propsToCache);
// Touch to bring into current txn
touchNodeImpl(nodeId);
}
// Touch to bring into current transaction
if (updated || auditableProps != null)
{
touchNodeImpl(nodeId, auditableProps);
}
// Done