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 (5.2) to 5.2.N (5.2.1)

Browse Source 
126588 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124813 jkaabimofrad: RA-889: Changed multipart field's name from "filename" to "name".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:13:13 +00:00
parent e9dbbc1cd0
commit e4beb318b7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -2093,7 +2093,7 @@ public class NodesImpl implements Nodes
{ {
switch (field.getName().toLowerCase()) switch (field.getName().toLowerCase())
{ {
case "filename": case "name":
String str = getStringOrNull(field.getValue()); String str = getStringOrNull(field.getValue());
if ((str != null) && (! str.isEmpty())) if ((str != null) && (! str.isEmpty()))
{ {

2
source/test-java/org/alfresco/rest/api/tests/util/MultiPartBuilder.java
View File

@@ -264,7 +264,7 @@ public class MultiPartBuilder
fp.setCharSet(fileData.getEncoding()); fp.setCharSet(fileData.getEncoding());
fp.setContentType(fileData.getMimetype()); fp.setContentType(fileData.getMimetype());
parts.add(fp); parts.add(fp);
addPartIfNotNull(parts, "filename", fileData.getFileName()); addPartIfNotNull(parts, "name", fileData.getFileName());
} }
addPartIfNotNull(parts, "relativepath", relativePath); addPartIfNotNull(parts, "relativepath", relativePath);
addPartIfNotNull(parts, "updatenoderef", updateNodeRef); addPartIfNotNull(parts, "updatenoderef", updateNodeRef);