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:56:52 +05:30
parent 014f0cd024
commit b00da84e6a
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,7 +286,8 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests
} }
@Override @Override
public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, SiteMembershipRequest siteInvite, String client) { public SiteMembershipRequest createSiteMembershipRequest(String inviteeId, SiteMembershipRequest siteInvite, String client)
{
SiteMembershipRequest request = null; SiteMembershipRequest request = null;
inviteeId = people.validatePerson(inviteeId, true); inviteeId = people.validatePerson(inviteeId, true);

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

@@ -74,9 +74,11 @@ RelationshipResourceAction.Create<SiteMembershipRequest>, RelationshipResourceAc
for(SiteMembershipRequest invite : invites) for(SiteMembershipRequest invite : invites)
{ {
SiteMembershipRequest siteInvite = null; SiteMembershipRequest siteInvite = null;
if(invite.getClient() != null) { if(invite.getClient() != null)
{
siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite, invite.getClient()); siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite, invite.getClient());
} else { } else
{
siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite); siteInvite = siteMembershipRequests.createSiteMembershipRequest(personId, invite);
} }
result.add(siteInvite); result.add(siteInvite);

3
repository/src/main/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
View File

@@ -2107,7 +2107,8 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString()); workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString());
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_CLIENT_NAME, clientName); 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); ClientAppConfig.ClientApp client = clientAppConfig.getClient(clientName);
workflowProps.put(WorkflowModelModeratedInvitation.WF_TEMPLATE_ASSETS_URL, client.getTemplateAssetsUrl()); workflowProps.put(WorkflowModelModeratedInvitation.WF_TEMPLATE_ASSETS_URL, client.getTemplateAssetsUrl());
workflowProps.put(WorkflowModelModeratedInvitation.WF_WORKSPACE_URL, client.getProperty("workspaceUrl")); workflowProps.put(WorkflowModelModeratedInvitation.WF_WORKSPACE_URL, client.getProperty("workspaceUrl"));

8
repository/src/main/resources/alfresco/repository.properties
View File

@@ -1248,11 +1248,3 @@ alfresco.content.directAccessUrl.lifetimeInSec=300
# Creates additional indexes on alf_node and alf_transaction. Recommended for large repositories. # Creates additional indexes on alf_node and alf_transaction. Recommended for large repositories.
system.new-node-transaction-indexes.ignored=true 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