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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
82376: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76481: Removed content downloaded event, its now part of the activity stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-04 06:51:12 +00:00
parent 7954be61aa
commit f1583306ca
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
View File

@@ -354,21 +354,21 @@ public class ContentStreamer implements ResourceLoaderAware
final long size = reader.getSize(); final long size = reader.getSize();
final String encoding = reader.getEncoding(); final String encoding = reader.getEncoding();
if (attach) // if (attach)
{ // {
final String finalMimetype = mimetype; // final String finalMimetype = mimetype;
//
eventPublisher.publishEvent(new EventPreparator(){ // eventPublisher.publishEvent(new EventPreparator(){
@Override // @Override
public Event prepareEvent(String user, String networkId, String transactionId) // public Event prepareEvent(String user, String networkId, String transactionId)
{ // {
String siteId = siteService.getSiteShortName(nodeRef); // String siteId = siteService.getSiteShortName(nodeRef);
//
return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, // return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId,
nodeRef.getId(), siteId, propertyQName.toString(), Client.asType(ClientType.webclient), attachFileName, finalMimetype, size, encoding); // nodeRef.getId(), siteId, propertyQName.toString(), Client.asType(ClientType.webclient), attachFileName, finalMimetype, size, encoding);
} // }
}); // });
} // }
if (range == null) if (range == null)
{ {