Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

124158 jkaabimofrad: SFS-405, RA-778: (WIP)
      - Added quick-share client registry config.
      - Modified the send shared-link email API, based on the revised acceptance criteria.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 11:26:33 +00:00
parent 82a06e6a02
commit 96c1618426
4 changed files with 49 additions and 66 deletions

View File

@@ -32,9 +32,9 @@ import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAct
import org.alfresco.rest.framework.resource.content.BinaryResource;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.rest.framework.webscripts.WithResponse;
import org.alfresco.util.ParameterCheck;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.extensions.webscripts.Status;
import java.util.List;
@@ -131,10 +131,10 @@ public class QuickShareLinkEntityResource implements EntityResourceAction.ReadBy
}
@Operation("email")
@WebApiDescription(title = "Email shared link", description = "Email the shared link")
public void email(String nodeId, QuickShareLinkEmailRequest emailRequest, Parameters parameters, WithResponse withResponse)
@WebApiDescription(title = "Email shared link", successStatus = Status.STATUS_ACCEPTED)
public void email(String sharedId, QuickShareLinkEmailRequest emailRequest, Parameters parameters)
{
quickShareLinks.emailSharedLink(nodeId, emailRequest, parameters);
quickShareLinks.emailSharedLink(sharedId, emailRequest, parameters);
}
/**