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 
126581 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124740 gjames: RA-847, RA-848 Retrieving deleted nodes


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

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

@@ -63,6 +63,10 @@ public class Node implements Comparable<Node>
protected UserInfo createdByUser;
protected UserInfo modifiedByUser;
//Archived info, explicitly setting to NULL because NULLS don't get shown in the JSON.
protected Date archivedAt = null;
protected UserInfo archivedByUser = null;
protected Boolean isFolder;
protected Boolean isFile;
protected Boolean isLink;
@@ -310,6 +314,26 @@ public class Node implements Comparable<Node>
this.relativePath = relativePath;
}
public Date getArchivedAt()
{
return archivedAt;
}
public void setArchivedAt(Date archivedAt)
{
this.archivedAt = archivedAt;
}
public UserInfo getArchivedByUser()
{
return archivedByUser;
}
public void setArchivedByUser(UserInfo archivedByUser)
{
this.archivedByUser = archivedByUser;
}
public boolean equals(Object other)
{
if(this == other)
@@ -346,6 +370,14 @@ public class Node implements Comparable<Node>
sb.append(", modifiedByUser=").append(getModifiedByUser());
sb.append(", createdAt=").append(getCreatedAt());
sb.append(", createdByUser=").append(getCreatedByUser());
if (getArchivedAt() != null)
{
sb.append(", archivedAt=").append(getArchivedAt());
}
if (getArchivedByUser() != null)
{
sb.append(", archivedByUser=").append(getArchivedByUser());
}
if (getIsLink() != null)
{
sb.append(", isLink=").append(getIsLink()); // note: symbolic link (not shared link)