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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
67743: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66008: Merged DEV to V4.2-BUG-FIX (4.2.2)
         66007: MNT-10487: Public API does not allow to query for pooled tasks with candidate-users and groups
            Corrected the previous commit made to the duplicate piece of code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:01:30 +00:00
parent 75a58497fc
commit 2821d0afde
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java
View File

@@ -376,8 +376,10 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain()); query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
} }
// Add involvment filtering if user is not admin // Add involvement filtering if user is not admin
if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser())) { if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser()) &&
candidateUser == null && candidateGroup == null)
{
query.taskInvolvedUser(AuthenticationUtil.getRunAsUser()); query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
} }
@@ -558,8 +560,7 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
} }
// Add involvement filtering if user is not admin // Add involvement filtering if user is not admin
if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser()) && if(processInstanceId == null && !authorityService.isAdminAuthority(AuthenticationUtil.getRunAsUser()))
candidateUser == null && candidateGroup == null)
{ {
query.taskInvolvedUser(AuthenticationUtil.getRunAsUser()); query.taskInvolvedUser(AuthenticationUtil.getRunAsUser());
} }