inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

Browse Source 
115566 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112558 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112545: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112271: Merged DEV to V4.2-BUG-FIX (4.2.6)
               111087: MNT-11957 - move approveModeratedInvitation to InvitationService so its auditable
               111792: MNT-11957: Approving a request to join site not available for auditing
                  - move rejectModeratedInvitation to InvitationService so its auditable
               111854: MNT-11957: Approving a request to join site not available for auditing
                  - move acceptNominatedInvitation and cancelInvitation to InvitationService so its auditable
               111890: MNT-11957: Approving a request to join site not available for auditing
                  - Removed obsolete methods from InviteHelper
               111991: MNT-11957: Approving a request to join site not available for auditing
                  - move deleteAuthenticationIfUnused and sendNominatedInvitationto InvitationService so its auditable. Excluded InviteHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:17:43 +00:00
parent 1aa10f662b
commit aee9e920ed
19 changed files with 624 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/invitation/site/CancelInviteAction.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,6 +18,10 @@
*/
package org.alfresco.repo.invitation.site;
import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarInviteeUserName;
import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarResourceName;
import static org.alfresco.repo.invitation.WorkflowModelNominatedInvitation.wfVarWorkflowInstanceId;
import java.util.Map;
import org.alfresco.repo.workflow.jbpm.JBPMEngine;
@@ -41,7 +45,13 @@ public class CancelInviteAction extends AbstractInvitationAction
public void execute(ExecutionContext executionContext) throws Exception
{
Map<String, Object> executionVariables = executionContext.getContextInstance().getVariables();
String invitationId = JBPMEngine.ENGINE_ID + "$" + executionContext.getContextInstance().getProcessInstance().getId();
inviteHelper.cancelInvitation(executionVariables, invitationId);
String currentInviteId = JBPMEngine.ENGINE_ID + "$" + executionContext.getContextInstance().getProcessInstance().getId();
// Get the invitee user name and site short name variables off the execution context
String invitee = (String) executionVariables.get(wfVarInviteeUserName);
String siteName = (String) executionVariables.get(wfVarResourceName);
String inviteId = (String) executionVariables.get(wfVarWorkflowInstanceId);
invitationService.cancelInvitation(siteName, invitee, inviteId, currentInviteId);
}
}