Merged HEAD (5.2) to 5.2.N (5.2.1)

126518 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122954 jvonka: (Quick) Shared Links API - add optional select/include of "allowableOperations" when authenticated and getting shared link info or find links (or even after create)
      RA-750, RA-777


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:56:47 +00:00
parent eb78ee21a1
commit a59b24b576
4 changed files with 135 additions and 33 deletions

View File

@@ -19,6 +19,7 @@
package org.alfresco.rest.api.model;
import java.util.Date;
import java.util.List;
/**
* Representation of quick share link
@@ -45,10 +46,13 @@ public class QuickShareLink
private String name;
private ContentInfo content;
protected Date modifiedAt;
protected UserInfo modifiedByUser;
private Date modifiedAt;
private UserInfo modifiedByUser;
private UserInfo sharedByUser;
private List<String> allowableOperations;
protected UserInfo sharedByUser;
public QuickShareLink()
{
@@ -126,6 +130,16 @@ public class QuickShareLink
this.sharedByUser = sharedByUser;
}
public List<String> getAllowableOperations()
{
return allowableOperations;
}
public void setAllowableOperations(List<String> allowableOperations)
{
this.allowableOperations = allowableOperations;
}
// eg. for debug logging etc
@Override
public String toString()
@@ -138,6 +152,7 @@ public class QuickShareLink
sb.append(", modifiedByUser=").append(getModifiedByUser());
sb.append(", sharedByUser=").append(getSharedByUser());
sb.append(", content=").append(getContent());
sb.append(", allowableOperations=").append(getAllowableOperations());
sb.append("]");
return sb.toString();
}