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

CLOUD-1824: using additional processVariableValueEquals() for pooled tasks filter when workflow-definitions are shared across tenants in MT-env (cloud)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@51967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2013-07-02 12:55:34 +00:00
parent 113822227c
commit 81ba1715c4
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

@@ -1469,7 +1469,15 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
private void addTasksForCandidateGroups(List<String> groupNames, Map<String, Task> resultingTasks) private void addTasksForCandidateGroups(List<String> groupNames, Map<String, Task> resultingTasks)
{ {
if(groupNames != null && groupNames.size() > 0) { if(groupNames != null && groupNames.size() > 0) {
List<Task> tasks = taskService.createTaskQuery().taskCandidateGroupIn(groupNames).list();
TaskQuery query = taskService.createTaskQuery().taskCandidateGroupIn(groupNames);
// Additional filtering on the tenant-property in case workflow-definitions are shared across tenants
if(!activitiUtil.isMultiTenantWorkflowDeploymentEnabled() && tenantService.isEnabled()) {
query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
}
List<Task> tasks =query.list();
for(Task task : tasks) for(Task task : tasks)
{ {
resultingTasks.put(task.getId(), task); resultingTasks.put(task.getId(), task);
@@ -1479,7 +1487,14 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
private void addTasksForCandidateUser(String userName, Map<String, Task> resultingTasks) private void addTasksForCandidateUser(String userName, Map<String, Task> resultingTasks)
{ {
List<Task> tasks = taskService.createTaskQuery().taskCandidateUser(userName).list(); TaskQuery query = taskService.createTaskQuery().taskCandidateUser(userName);
// Additional filtering on the tenant-property in case workflow-definitions are shared across tenants
if(!activitiUtil.isMultiTenantWorkflowDeploymentEnabled() && tenantService.isEnabled()) {
query.processVariableValueEquals(ActivitiConstants.VAR_TENANT_DOMAIN, TenantUtil.getCurrentDomain());
}
List<Task> tasks = query.list();
for(Task task : tasks) for(Task task : tasks)
{ {
resultingTasks.put(task.getId(), task); resultingTasks.put(task.getId(), task);