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 
126481 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122580 jvonka: Nodes (FileFolder) API - return isFile in node info (renamed from isContent) in addition to isFolder
      RA-828, RA-741


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:37:52 +00:00
parent 5690ddd7cc
commit fbe19dfc15
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ public class Node implements Comparable<Node>
protected UserInfo modifiedByUser;
protected Boolean isFolder;
protected Boolean isContent;
protected Boolean isFile;
protected Boolean isLink;
protected NodeRef parentNodeRef;
@@ -261,14 +261,14 @@ public class Node implements Comparable<Node>
this.isFolder = isFolder;
}
public Boolean getIsContent()
public Boolean getIsFile()
{
return isContent;
return isFile;
}
public void setIsContent(Boolean isContent)
public void setIsFile(Boolean isFile)
{
this.isContent = isContent;
this.isFile = isFile;
}
public Boolean getIsLink()
@@ -309,7 +309,7 @@ public class Node implements Comparable<Node>
return "Node [nodeRef=" + nodeRef + ", type=" + prefixTypeQName + ", name=" + name + ", title="
+ title + ", description=" + description + ", createdAt="
+ createdAt + ", modifiedAt=" + modifiedAt + ", createdByUser=" + createdByUser + ", modifiedBy="
+ modifiedByUser + ", isFolder =" + isFolder + ", isContent =" + isContent + ", pathInfo =" + pathInfo +"]";
+ modifiedByUser + ", isFolder =" + isFolder + ", isFile =" + isFile + ", pathInfo =" + pathInfo +"]";
}
// here to allow POST /nodes/{id}/children when creating empty file with specified content.mimeType