Merged HEAD (5.2) to 5.2.N (5.2.1)

126383 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120445 jvonka: RA-631, RA-641: REST fwk - fix GET node binary resource (set content-disposition/attachment header)
      - by default, set attachment header when downloading content
      - unless "attachment=false" *and* content type is in nonAttachContentTypes white list (eg. pdf, images)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:56:08 +00:00
parent 3376295913
commit ffdfaf608e
4 changed files with 97 additions and 29 deletions

View File

@@ -39,13 +39,16 @@ public class NodeBinaryResource implements BinaryResource
final NodeRef nodeRef;
final QName propertyQName;
final ContentInfo contentInfo;
final String attachFileName;
public NodeBinaryResource(NodeRef nodeRef, QName propertyQName, ContentInfo contentInfo)
public NodeBinaryResource(NodeRef nodeRef, QName propertyQName, ContentInfo contentInfo, String attachFileName)
{
super();
this.nodeRef = nodeRef;
this.propertyQName = propertyQName;
this.contentInfo = contentInfo;
this.attachFileName = attachFileName;
}
public NodeRef getNodeRef()
@@ -61,4 +64,8 @@ public class NodeBinaryResource implements BinaryResource
public ContentInfo getContentInfo() {
return this.contentInfo;
}
public String getAttachFileName() {
return this.attachFileName;
}
}