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

Fixed a bug with the URL generated in the Inviatation Email.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-08-26 13:01:47 +00:00
parent 296423af16
commit b746747d4a
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/invitation/InviteHelper.java
View File

@@ -325,7 +325,7 @@ public class InviteHelper implements InitializingBean
deleteAuthenticationIfUnused(inviteeUserName, currentInviteId); deleteAuthenticationIfUnused(inviteeUserName, currentInviteId);
} }
public void sendNominatedInvitation(Map<String, Object> executionVariables) public void sendNominatedInvitation(String inviteId, Map<String, Object> executionVariables)
{ {
if(invitationService.isSendEmails()) if(invitationService.isSendEmails())
{ {
@@ -336,9 +336,7 @@ public class InviteHelper implements InitializingBean
String packageRef = packageNode.getNodeRef().toString(); String packageRef = packageNode.getNodeRef().toString();
properties.put(InviteSender.WF_PACKAGE, packageRef); properties.put(InviteSender.WF_PACKAGE, packageRef);
String instanceName=WorkflowModel.PROP_WORKFLOW_INSTANCE_ID.toPrefixString(namespaceService).replace(":", "_"); properties.put(InviteSender.WF_INSTANCE_ID, inviteId);
String instanceId = (String) executionVariables.get(instanceName);
properties.put(InviteSender.WF_INSTANCE_ID, instanceId);
inviteSender.sendMail(properties); inviteSender.sendMail(properties);
} }

4
source/java/org/alfresco/repo/invitation/activiti/SendNominatedInviteDelegate.java
View File

@@ -21,6 +21,7 @@ package org.alfresco.repo.invitation.activiti;
import java.util.Map; import java.util.Map;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.alfresco.repo.workflow.activiti.ActivitiConstants;
/** /**
* Activiti delegate that is executed when a invitation request has * Activiti delegate that is executed when a invitation request has
@@ -36,8 +37,9 @@ public class SendNominatedInviteDelegate extends AbstractInvitationDelegate
@Override @Override
public void execute(DelegateExecution execution) throws Exception public void execute(DelegateExecution execution) throws Exception
{ {
String invitationId = ActivitiConstants.ENGINE_ID + "$" + execution.getProcessInstanceId();
Map<String, Object> variables = execution.getVariables(); Map<String, Object> variables = execution.getVariables();
inviteHelper.sendNominatedInvitation(variables); inviteHelper.sendNominatedInvitation(invitationId, variables);
} }
} }

9
source/java/org/alfresco/repo/invitation/site/SendInviteAction.java
View File

@@ -21,6 +21,8 @@ package org.alfresco.repo.invitation.site;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.workflow.jbpm.JBPMEngine;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.exe.ExecutionContext;
public class SendInviteAction extends AbstractInvitationAction public class SendInviteAction extends AbstractInvitationAction
@@ -30,8 +32,11 @@ public class SendInviteAction extends AbstractInvitationAction
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void execute(final ExecutionContext context) throws Exception public void execute(final ExecutionContext context) throws Exception
{ {
Map<String, Object> executionVariables = context.getContextInstance().getVariables(); ContextInstance contextInstance = context.getContextInstance();
inviteHelper.sendNominatedInvitation(executionVariables); long processId = contextInstance.getProcessInstance().getId();
String inviteId = JBPMEngine.ENGINE_ID + "$" + processId;
Map<String, Object> executionVariables = contextInstance.getVariables();
inviteHelper.sendNominatedInvitation(inviteId, executionVariables);
} }
} }