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 
126410 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121557 jvonka: FileFolder API - experimental support for multi move/copy via post to target folder
      - please note: API (including uri endpoint) is subject to change
      RA-683, RA-684


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126756 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:10:51 +00:00
parent 3914ebcfcc
commit cb90942321
4 changed files with 137 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/rest/api/model/Node.java
View File

@@ -34,7 +34,6 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.rest.framework.resource.UniqueId;
import org.alfresco.rest.framework.resource.content.*;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.NoSuchPersonException;
@@ -68,7 +67,6 @@ public class Node implements Comparable<Node>
protected String prefixTypeQName;
protected List<String> aspectNames;
protected Map<String, Object> properties;
public Node(NodeRef nodeRef, NodeRef parentNodeRef, Map<QName, Serializable> nodeProps, Map<String, UserInfo> mapUserInfo, ServiceRegistry sr)
@@ -143,6 +141,8 @@ public class Node implements Comparable<Node>
return userInfo;
}
// note: nodeRef maps to json "id" (when serializing/deserializng)
@UniqueId
public NodeRef getNodeRef()
{
@@ -285,6 +285,7 @@ public class Node implements Comparable<Node>
}
// here to allow POST /nodes/{id}/children when creating empty file with specified content.mimeType
protected ContentInfo contentInfo;
public void setContent(ContentInfo contentInfo)
@@ -297,6 +298,21 @@ public class Node implements Comparable<Node>
return this.contentInfo;
}
// TODO experimental (API subject to change) - special property (request-only) to allow move/copy via POST /nodes/{id}/children
protected String action;
public String getAction()
{
return action;
}
public void setAction(String action)
{
this.action = action;
}
// TODO for backwards compat' - set explicitly when needed (ie. favourites) (note: we could choose to have separate old Node/NodeImpl etc)
protected String title;
@@ -383,4 +399,5 @@ public class Node implements Comparable<Node>
{
this.modifiedBy = modifiedBy;
}
}