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
This commit is contained in:
Jan Vonka
2007-09-12 14:47:55 +00:00
parent 57a468dfe2
commit 8fcf3da049
2 changed files with 16 additions and 2 deletions

View File

@@ -42,6 +42,7 @@
<property name="authorityDAO" ref="authorityDAO"/> <property name="authorityDAO" ref="authorityDAO"/>
<property name="transactionService" ref="transactionService"/> <property name="transactionService" ref="transactionService"/>
<property name="fileFolderService" ref="FileFolderService"/> <property name="fileFolderService" ref="FileFolderService"/>
<property name="tenantService" ref="tenantService"/>
</bean> </bean>
<bean id="workflowInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent"> <bean id="workflowInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">

View File

@@ -41,6 +41,7 @@ import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authority.AuthorityDAO; 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.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avmsync.AVMDifference; import org.alfresco.service.cmr.avmsync.AVMDifference;
@@ -86,7 +87,7 @@ public class WorkflowInterpreter extends BaseInterpreter
private AVMSyncService avmSyncService; private AVMSyncService avmSyncService;
private PersonService personService; private PersonService personService;
private FileFolderService fileFolderService; private FileFolderService fileFolderService;
private TenantService tenantService;
/** /**
* Current context * Current context
@@ -153,6 +154,14 @@ public class WorkflowInterpreter extends BaseInterpreter
this.nodeService = nodeService; this.nodeService = nodeService;
} }
/**
* @param tenantService The Tenant Service
*/
public void setTenantService(TenantService tenantService)
{
this.tenantService = tenantService;
}
/** /**
* @param avmService The AVM Service * @param avmService The AVM Service
*/ */
@@ -841,7 +850,11 @@ public class WorkflowInterpreter extends BaseInterpreter
{ {
if (command.length == 2) if (command.length == 2)
{ {
setCurrentUserName(command[1]); if (tenantService.isEnabled())
{
tenantService.checkDomainUser(command[1]);
}
setCurrentUserName(command[1]);
} }
out.println("using user " + getCurrentUserName()); out.println("using user " + getCurrentUserName());
} }