From b00da84e6a26aa479a10bc8aacbde232ad09fa3e Mon Sep 17 00:00:00 2001 From: dhrn Date: Thu, 5 Nov 2020 18:56:52 +0530 Subject: [PATCH] fixed comments --- .../rest/api/impl/SiteMembershipRequestsImpl.java | 3 ++- .../people/PersonSiteMembershipRequestsRelation.java | 6 ++++-- .../repo/invitation/InvitationServiceImpl.java | 3 ++- .../src/main/resources/alfresco/repository.properties | 10 +--------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java index f4bd511887..4bcb202749 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java @@ -286,7 +286,8 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests } @Override - public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, SiteMembershipRequest siteInvite, String client) { + public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, SiteMembershipRequest siteInvite, String client) + { SiteMembershipRequest request = null; inviteeId = people.validatePerson(inviteeId, true); diff --git a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java index 2ac44b6e11..33b294a546 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/people/PersonSiteMembershipRequestsRelation.java @@ -74,9 +74,11 @@ RelationshipResourceAction.Create, RelationshipResourceAc for(SiteMembershipRequest invite : invites) { SiteMembershipRequest siteInvite = null; - if(invite.getClient() != null) { + if(invite.getClient() != null) + { siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite, invite.getClient()); - } else { + } else + { siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite); } result.add(siteInvite); diff --git a/repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java index 841ac7c2ce..ea9aeb9a51 100644 --- a/repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java @@ -2107,7 +2107,8 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString()); workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_CLIENT_NAME, clientName); - if(clientName != null && clientAppConfig.getClient(clientName) != null) { + if(clientName != null && clientAppConfig.getClient(clientName) != null) + { ClientAppConfig.ClientApp client = clientAppConfig.getClient(clientName); workflowProps.put(WorkflowModelModeratedInvitation.WF_TEMPLATE_ASSETS_URL, client.getTemplateAssetsUrl()); workflowProps.put(WorkflowModelModeratedInvitation.WF_WORKSPACE_URL, client.getProperty("workspaceUrl")); diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index 3c29379709..d3679580ed 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -1247,12 +1247,4 @@ alfresco.content.directAccessUrl.lifetimeInSec=300 # Creates additional indexes on alf_node and alf_transaction. Recommended for large repositories. system.new-node-transaction-indexes.ignored=true - -## Sample Gmail settings -mail.host=smtp.gmail.com -mail.port=465 -mail.username=trainee_muraai@muraai.com -mail.password=Welcome123 -mail.protocol=smtps -mail.smtps.starttls.enable=true -mail.smtps.auth=true \ No newline at end of file + \ No newline at end of file