mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3925 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -35,6 +35,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||
import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.util.PropertyMap;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
@@ -126,7 +127,7 @@ public class AuditableAspect
|
||||
public void onAddAudit(NodeRef nodeRef, QName aspect)
|
||||
{
|
||||
// Get the current properties
|
||||
Map<QName, Serializable> properties = this.nodeService.getProperties(nodeRef);
|
||||
PropertyMap properties = new PropertyMap();
|
||||
|
||||
// Set created / updated date
|
||||
Date now = new Date(System.currentTimeMillis());
|
||||
@@ -167,7 +168,7 @@ public class AuditableAspect
|
||||
// Get the current properties
|
||||
try
|
||||
{
|
||||
Map<QName, Serializable> properties = this.nodeService.getProperties(nodeRef);
|
||||
PropertyMap properties = new PropertyMap();
|
||||
|
||||
// Set updated date
|
||||
Date now = new Date(System.currentTimeMillis());
|
||||
@@ -249,7 +250,11 @@ public class AuditableAspect
|
||||
*/
|
||||
public Boolean doWork() throws Exception
|
||||
{
|
||||
nodeService.setProperties(nodeRef, properties);
|
||||
for (QName propertyQName : properties.keySet())
|
||||
{
|
||||
Serializable property = properties.get(propertyQName);
|
||||
nodeService.setProperty(nodeRef, propertyQName, property);
|
||||
}
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user