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

ALF-19942 : Failed to displayed Process Engines page in Admin Console after creation of workflow by tenant user

Browse Source 
- Fixed failing unit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2013-10-01 17:34:19 +00:00
parent 4ffade2d96
commit ee8816e7af
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1121,7 +1121,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
*/ */
private List<WorkflowTask> getValidWorkflowTasks(List<Task> tasks) private List<WorkflowTask> getValidWorkflowTasks(List<Task> tasks)
{ {
return typeConverter.doSpecialTenantFilterAndSafeConvert(tasks, new Function<Task, String>() return typeConverter.filterByDomainAndConvert(tasks, new Function<Task, String>()
{ {
public String apply(Task task) public String apply(Task task)
{ {
@@ -2222,7 +2222,14 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
completedInstances = query.list(); completedInstances = query.list();
} }
List<WorkflowInstance> completedResults = typeConverter.convert(completedInstances); List<WorkflowInstance> completedResults = typeConverter.doSpecialTenantFilterAndSafeConvert(completedInstances, new Function<HistoricProcessInstance, String>()
{
public String apply(HistoricProcessInstance historicProcessInstance)
{
ProcessDefinition procDef = activitiUtil.getProcessDefinition(historicProcessInstance.getProcessDefinitionId());
return procDef.getKey();
}
});
results.addAll(completedResults); results.addAll(completedResults);
return results; return results;