From 227f276ab40c526e71b54789880c7ea77e61793d Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 2 Apr 2014 22:28:45 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 65911: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud) 65744: Merged DEV to V4.2-BUG-FIX (4.2.2) 65743: MNT-10487: Public API does not allow to query for pooled tasks with candidate-users and groups Do not add involvedUser to the query if candidateUser or candidateGroup is set (suggested by Frederik Heremans). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66282 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/workflow/api/impl/TasksImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java b/source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java index f32354550e..be63935ad8 100644 --- a/source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java +++ b/source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java @@ -557,8 +557,9 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain()); } - // Add involvment filtering if user is not admin - if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) + // Add involvement filtering if user is not admin + if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser()) && + candidateUser == null && candidateGroup == null) { query.taskInvolvedUser(AuthenticationUtil.getRunAsUser()); }