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

Merged V3.1 to HEAD

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-client-application-context.xml
View File

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

7
source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@@ -66,11 +66,6 @@ public class ConfigAdminInterpreter extends BaseInterpreter
ApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"}); ApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"});
runMain(context, "webClientConfigAdminInterpreter"); 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. * Execute a single command using the BufferedReader passed in for any data needed.