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

Merge from HEAD into WCM-DEV2. Also fixes build breakage in

Browse Source 
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-24 18:27:41 +00:00
parent ca9496d090
commit f6355ea108
171 changed files with 11880 additions and 3450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
View File

@@ -266,11 +266,18 @@ public class AlfrescoNavigationHandler extends NavigationHandler
if (dispatchContext != null)
{
if (logger.isDebugEnabled())
logger.debug("Using dispatch context for dialog lookup: " +
dispatchContext.getType().toString());
// use the node to perform the lookup (this will include the global section)
config = configSvc.getConfig(dispatchContext);
}
else
{
if (logger.isDebugEnabled())
logger.debug("Looking up dialog in global config");
// just use the global
config = configSvc.getGlobalConfig();
}
@@ -306,11 +313,18 @@ public class AlfrescoNavigationHandler extends NavigationHandler
if (dispatchContext != null)
{
if (logger.isDebugEnabled())
logger.debug("Using dispatch context for wizard lookup: " +
dispatchContext.getType().toString());
// use the node to perform the lookup (this will include the global section)
config = configSvc.getConfig(dispatchContext);
}
else
{
if (logger.isDebugEnabled())
logger.debug("Looking up wizard in global config");
// just use the global
config = configSvc.getGlobalConfig();
}