From 256e7434bd2a8b0ee1ae27247b1a80f65f071e40 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 26 Apr 2010 16:34:28 +0000 Subject: [PATCH] Merged PATCHES/V3.1.2 to HEAD 19823: (RECORD ONLY) Merged HEAD to PATCHES/V3.1.2 (back-port escalation request) 19710: Fix for ALF-2216 - completed support for single and multi-byte range requests via the download content servlet 19711: Bring GuestDownloadContentServlet inline with Download servlet changes 19751: Fix for ALF-934 - View Details does not refresh the doc properties when displaying multiple documents via Direct URL git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/app/servlet/ExternalAccessServlet.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java index 8759366fc4..8b9e15aa72 100644 --- a/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java +++ b/source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java @@ -171,6 +171,11 @@ public class ExternalAccessServlet extends BaseServlet // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_DOCDETAILS); + + // Do not forward via faces context when AlfrescoNavigationHandler has already called render response phase + String viewId = fc.getViewRoot().getViewId(); + getServletContext().getRequestDispatcher(viewId).forward(req, res); + return; } else if (OUTCOME_SPACEDETAILS.equals(outcome)) { @@ -204,6 +209,11 @@ public class ExternalAccessServlet extends BaseServlet // perform the appropriate JSF navigation outcome NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler(); navigationHandler.handleNavigation(fc, null, "dialog:" + OUTCOME_SPACEDETAILS); + + // Do not forward via faces context when AlfrescoNavigationHandler has already called render response phase + String viewId = fc.getViewRoot().getViewId(); + getServletContext().getRequestDispatcher(viewId).forward(req, res); + return; } else if (OUTCOME_BROWSE.equals(outcome)) {