inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)

Browse Source 
135136 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135040 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - Remove the ASPECT_ANULLABLE from an invited user if the invitation is accepted successfully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Constantin Popa
2017-02-14 16:22:55 +00:00
parent d94bb9bd5b
commit 80586e5a72
2 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
View File

@@ -459,7 +459,7 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);
//MNT-9101 Share: Cancelling an invitation for a disabled user, the user gets deleted in the process.
NodeRef person = personService.getPersonOrNull(invitation.getInviterUserName());
NodeRef person = personService.getPersonOrNull(invitation.getInviteeUserName());
if (person != null && nodeService.hasAspect(person, ContentModel.ASPECT_ANULLABLE))
{
nodeService.removeAspect(person, ContentModel.ASPECT_ANULLABLE);