Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

124548 jvonka: RA-834, RA-678: create "renditions" request only applicable when creating/uploading file via multipart/form-data (not when creating empty file via json request)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 11:29:54 +00:00
parent 43f3777e99
commit a2378b1422
2 changed files with 5 additions and 5 deletions

View File

@@ -1345,7 +1345,6 @@ public class NodesImpl implements Nodes
fileFolderService.delete(nodeRef);
}
// TODO should we able to specify content properties (eg. mimeType ... or use extension for now, or encoding)
@Override
public Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters)
{
@@ -1384,6 +1383,7 @@ public class NodesImpl implements Nodes
validateCmObject(nodeTypeQName);
}
/* RA-834: commented-out since not currently applicable for empty file
List<ThumbnailDefinition> thumbnailDefs = null;
String renditionsParam = parameters.getParameter(PARAM_RENDITIONS);
if (renditionsParam != null)
@@ -1395,6 +1395,7 @@ public class NodesImpl implements Nodes
thumbnailDefs = getThumbnailDefs(renditionsParam);
}
*/
Map<QName, Serializable> props = new HashMap<>(1);
@@ -1448,7 +1449,9 @@ public class NodesImpl implements Nodes
Node newNode = getFolderOrDocument(nodeRef.getId(), parameters);
/* RA-834: commented-out since not currently applicable for empty file
requestRenditions(thumbnailDefs, newNode); // note: noop for folder
*/
return newNode;
}