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
This commit is contained in:
Alan Davis
2014-04-02 22:28:45 +00:00
parent d709289ef8
commit 227f276ab4

View File

@@ -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());
}