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
This commit is contained in:
Dave Ward
2010-10-05 20:52:34 +00:00
parent 686abca3c9
commit c69d0afbf8

View File

@@ -165,7 +165,6 @@ public class ExternalAccessServlet extends BaseServlet
browseBean.setupContentAction(nodeRef.getId(), true); browseBean.setupContentAction(nodeRef.getId(), true);
} }
fc.getExternalContext().getSessionMap().put(AlfrescoNavigationHandler.EXTERNAL_CONTAINER_SESSION, Boolean.TRUE);
// perform the appropriate JSF navigation outcome // perform the appropriate JSF navigation outcome
NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler();
navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_DOCDETAILS); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_DOCDETAILS);
@@ -195,7 +194,7 @@ public class ExternalAccessServlet extends BaseServlet
// setup the Space on the browse bean // setup the Space on the browse bean
browseBean.setupSpaceAction(nodeRef.getId(), true); browseBean.setupSpaceAction(nodeRef.getId(), true);
} }
fc.getExternalContext().getSessionMap().put(AlfrescoNavigationHandler.EXTERNAL_CONTAINER_SESSION, Boolean.TRUE);
// perform the appropriate JSF navigation outcome // perform the appropriate JSF navigation outcome
NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler();
navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_SPACEDETAILS); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_SPACEDETAILS);