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 PATCHES/V3.1.2 to HEAD

Browse Source 
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
This commit is contained in:
Dave Ward
2010-04-26 16:34:28 +00:00
parent 7612a95c3e
commit 256e7434bd
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/app/servlet/ExternalAccessServlet.java
View File

@@ -171,6 +171,11 @@ public class ExternalAccessServlet extends BaseServlet
// 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);
// 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)) else if (OUTCOME_SPACEDETAILS.equals(outcome))
{ {
@@ -204,6 +209,11 @@ public class ExternalAccessServlet extends BaseServlet
// 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);
// 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)) else if (OUTCOME_BROWSE.equals(outcome))
{ {