From ee8816e7af845c712ad56bd2e6753d838db64d3d Mon Sep 17 00:00:00 2001
From: Pavel Yurke <Pavel.Yurkevich@synesis.ru>
Date: Tue, 1 Oct 2013 17:34:19 +0000
Subject: [PATCH] ALF-19942 : Failed to displayed Process Engines page in Admin
 Console after creation of workflow by tenant user    - Fixed failing unit
 tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../workflow/activiti/ActivitiWorkflowEngine.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
index 1c0269f41d..3ce435738a 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
@@ -1121,7 +1121,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
      */
     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)
             {
@@ -2222,7 +2222,14 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
             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);
         return results;