Merged V3.1 to HEAD

12904: Partial fix for ETHREEOH-1221


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-03-10 18:05:28 +00:00
parent ee2df661e5
commit d751695bed
2 changed files with 2 additions and 7 deletions

View File

@@ -225,7 +225,7 @@
<bean id="webClientConfigAdminInterpreter" class="org.alfresco.web.config.ConfigAdminInterpreter">
<property name="transactionService" ref="transactionComponent"/>
<property name="repoXMLConfigService" ref="webClientConfigService"/>
<property name="tenantService" ref="tenantService"/>
<property name="authorityService" ref="AuthorityService"/>
</bean>
<bean id="webClientConfigAdminInterpreterHelp" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -67,11 +67,6 @@ public class ConfigAdminInterpreter extends BaseInterpreter
runMain(context, "webClientConfigAdminInterpreter");
}
protected boolean hasAuthority(String username)
{
return ((username != null) && (tenantService.getBaseNameUser(username).equals(BaseInterpreter.DEFAULT_ADMIN)));
}
/**
* Execute a single command using the BufferedReader passed in for any data needed.
*