From c69d0afbf8681f944c65ad80bdf4027161ee7d0c Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Tue, 5 Oct 2010 20:52:34 +0000 Subject: [PATCH] Merged V3.3-BUG-FIX to HEAD 22886: (RECORD ONLY) Merged HEAD to V3.3-BUG-FIX 22849: JMX Dump webscript and Share Admin Console tool 22899: Merged DEV/TEMPORARY to V3.3-BUG-FIX 22842: ALF-2641: WebDav Permission Issues - MAC OSX Finder Implementation of WEBDAV DELETE with 'If' header passed. 22900: Merged V3.3 to V3.3-BUG-FIX 22898: Merged DEV/TEMPORARY to V3.3 22862: ALF-3579: Open the Details Page URL removes the header, navigation bar etc Additional fix for spaces view. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/ExternalAccessServlet.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java index 99ec2fd9ec..a0f6f9d0ea 100644 --- a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java +++ b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java @@ -165,7 +165,6 @@ public class ExternalAccessServlet extends BaseServlet browseBean.setupContentAction(nodeRef.getId(), true); } - fc.getExternalContext().getSessionMap().put(AlfrescoNavigationHandler.EXTERNAL_CONTAINER_SESSION, Boolean.TRUE); // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_DOCDETAILS); @@ -195,7 +194,7 @@ public class ExternalAccessServlet extends BaseServlet // setup the Space on the browse bean browseBean.setupSpaceAction(nodeRef.getId(), true); } - fc.getExternalContext().getSessionMap().put(AlfrescoNavigationHandler.EXTERNAL_CONTAINER_SESSION, Boolean.TRUE); + // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_SPACEDETAILS);