From 8fcf3da04925c9409a9a82e0a8dc82273dd51f3b Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 12 Sep 2007 14:47:55 +0000 Subject: [PATCH] MT fix to check domain when switching user in the Workflow console git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/workflow-context.xml | 1 + .../repo/workflow/WorkflowInterpreter.java | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/config/alfresco/workflow-context.xml b/config/alfresco/workflow-context.xml index fc68deb781..2194d39088 100644 --- a/config/alfresco/workflow-context.xml +++ b/config/alfresco/workflow-context.xml @@ -42,6 +42,7 @@ + diff --git a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java index 4c6147bbc8..ec7b78b315 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowInterpreter.java @@ -41,6 +41,7 @@ import org.alfresco.repo.avm.AVMNodeConverter; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authority.AuthorityDAO; +import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avmsync.AVMDifference; @@ -86,7 +87,7 @@ public class WorkflowInterpreter extends BaseInterpreter private AVMSyncService avmSyncService; private PersonService personService; private FileFolderService fileFolderService; - + private TenantService tenantService; /** * Current context @@ -153,6 +154,14 @@ public class WorkflowInterpreter extends BaseInterpreter this.nodeService = nodeService; } + /** + * @param tenantService The Tenant Service + */ + public void setTenantService(TenantService tenantService) + { + this.tenantService = tenantService; + } + /** * @param avmService The AVM Service */ @@ -841,7 +850,11 @@ public class WorkflowInterpreter extends BaseInterpreter { if (command.length == 2) { - setCurrentUserName(command[1]); + if (tenantService.isEnabled()) + { + tenantService.checkDomainUser(command[1]); + } + setCurrentUserName(command[1]); } out.println("using user " + getCurrentUserName()); }