From ac1b4e32373ba7cd023930df7977804b1c9588c1 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 12:13:53 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 93243: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 93081: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1) 93048: Merged DEV to V4.2-BUG-FIX (4.2.5) 92792 : MNT-13071 : After upgrade pending moderated invitations are causing exceptions in potentialmembers.get.js and invitations.get.js - Added old task type (WorkflowModelModeratedInvitation.WF_REVIEW_TASK) for pending review tasks git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94942 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/invitation/InvitationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java index bec570840f..854f4ea77d 100644 --- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java +++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java @@ -630,7 +630,7 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli List tasks = workflowService.getTasksForWorkflowPath(invitationId); for(WorkflowTask task : tasks) { - if(taskTypeMatches(task, WorkflowModelModeratedInvitation.WF_ACTIVITI_REVIEW_TASK)) + if(taskTypeMatches(task, WorkflowModelModeratedInvitation.WF_ACTIVITI_REVIEW_TASK, WorkflowModelModeratedInvitation.WF_REVIEW_TASK)) { reviewTask = task; break;