inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed comments

Browse Source
This commit is contained in:
dhrn
2020-11-05 18:48:22 +05:30
parent 6ccc4136ed
commit 014f0cd024
11 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
remote-api/src/main/java/org/alfresco/rest/api/SiteMembershipRequests.java
View File

@@ -56,10 +56,9 @@ public interface SiteMembershipRequests
* @param inviteeId the site invitee id
* @param siteInvite the site invite
* @param client the client name which is registered to send emails
* @param workspacePath path of workspace deployed location
* @return SiteMembershipRequest
*/
SiteMembershipRequest createSiteMembershipRequest(String inviteeId, final SiteMembershipRequest siteInvite, final String client, final String workspacePath);
SiteMembershipRequest createSiteMembershipRequest(String inviteeId, final SiteMembershipRequest siteInvite, final String client);
/**
* Update the site membership request for inviteeId and site

10
remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java
View File

@@ -158,9 +158,9 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests
}
private SiteMembershipRequest inviteToModeratedSite(final String message, final String inviteeId, final String siteId,
final String inviteeRole, final String clientName, final String workspacePath)
final String inviteeRole, final String clientName)
{
ModeratedInvitation invitation = invitationService.inviteModerated(message, inviteeId, ResourceType.WEB_SITE, siteId, inviteeRole, clientName, workspacePath);
ModeratedInvitation invitation = invitationService.inviteModerated(message, inviteeId, ResourceType.WEB_SITE, siteId, inviteeRole, clientName);
SiteMembershipRequest ret = new SiteMembershipRequest();
ret.setId(siteId);
@@ -270,7 +270,7 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests
if(siteVisibility.equals(SiteVisibility.MODERATED))
{
request = inviteToModeratedSite(message, inviteeId, siteId, inviteeRole, null, null);
request = inviteToModeratedSite(message, inviteeId, siteId, inviteeRole, null);
}
else if(siteVisibility.equals(SiteVisibility.PUBLIC))
{
@@ -286,7 +286,7 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests
}
@Override
public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, SiteMembershipRequest siteInvite, String client, String workspacePath) {
public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, SiteMembershipRequest siteInvite, String client) {
SiteMembershipRequest request = null;
inviteeId = people.validatePerson(inviteeId, true);
@@ -337,7 +337,7 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests
if(siteVisibility.equals(SiteVisibility.MODERATED))
{
request = inviteToModeratedSite(message, inviteeId, siteId, inviteeRole, client, workspacePath);;
request = inviteToModeratedSite(message, inviteeId, siteId, inviteeRole, client);;
}
else if(siteVisibility.equals(SiteVisibility.PUBLIC))
{

13
remote-api/src/main/java/org/alfresco/rest/api/model/SiteMembershipRequest.java
View File

@@ -53,6 +53,7 @@ public class SiteMembershipRequest implements Comparable<SiteMembershipRequest>
private Date modifiedAt;
private String title; // for sorting only
private Person person;
private String client;
public static Pair<String, String> splitId(String id)
{
@@ -137,11 +138,21 @@ public class SiteMembershipRequest implements Comparable<SiteMembershipRequest>
this.person = person;
}
public String getClient()
{
return client;
}
public void setClient(String client)
{
this.client = client;
}
@Override
public String toString()
{
return "SiteMembershipRequest [id=" + id + ", message=" + message + ", createdAt=" + createdAt
+ ", modifiedAt=" + modifiedAt + "]";
+ ", modifiedAt=" + modifiedAt + ", client=" + client + "]";
}
@Override

6
remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java
View File

@@ -74,10 +74,8 @@ RelationshipResourceAction.Create<SiteMembershipRequest>, RelationshipResourceAc
for(SiteMembershipRequest invite : invites)
{
SiteMembershipRequest siteInvite = null;
String client = parameters.getParameter("client");
String workspacePath = parameters.getParameter("workspacePath");
if(client != null) {
siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite, client, workspacePath);
if(invite.getClient() != null) {
siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite, invite.getClient());
} else {
siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite);
}