mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged BRANCHES/DEV/CLOUD1-BUG-FIX to HEAD:
42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -108,14 +108,14 @@ public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer
|
||||
String siteId = getSiteId();
|
||||
NodeRef deletedNodeRef = fileInfo.getNodeRef();
|
||||
FileInfo parentFile = getDAVHelper().getParentNodeForPath(getRootNodeRef(), getPath(), getServletPath());
|
||||
boolean hidden = getNodeService().hasAspect(deletedNodeRef, ContentModel.ASPECT_HIDDEN);
|
||||
boolean hidden = fileInfo.isHidden();
|
||||
// Delete it
|
||||
fileFolderService.delete(deletedNodeRef);
|
||||
// Don't post activity data for hidden files, resource forks etc.
|
||||
if (!hidden)
|
||||
{
|
||||
postActivity(parentFile, fileInfo, siteId);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,7 +156,7 @@ public class DeleteMethod extends WebDAVMethod implements ActivityPostProducer
|
||||
}
|
||||
}
|
||||
|
||||
activityPoster.postFileDeleted(siteId, tenantDomain, parentPath, parent, deletedFile);
|
||||
activityPoster.postFileFolderDeleted(siteId, tenantDomain, parentPath, parent, deletedFile);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user