mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -34,6 +34,7 @@ import org.alfresco.service.cmr.security.AccessStatus;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.web.app.Application;
|
||||
import org.alfresco.web.bean.BrowseBean;
|
||||
import org.alfresco.web.bean.dashboard.DashboardManager;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
@@ -61,12 +62,14 @@ public class ExternalAccessServlet extends BaseServlet
|
||||
|
||||
private static Log logger = LogFactory.getLog(ExternalAccessServlet.class);
|
||||
|
||||
private final static String OUTCOME_DOCDETAILS = "showDocDetails";
|
||||
private final static String OUTCOME_SPACEDETAILS = "showSpaceDetails";
|
||||
private final static String OUTCOME_BROWSE = "browse";
|
||||
private final static String OUTCOME_LOGOUT = "logout";
|
||||
public final static String OUTCOME_DOCDETAILS = "showDocDetails";
|
||||
public final static String OUTCOME_SPACEDETAILS = "showSpaceDetails";
|
||||
public final static String OUTCOME_BROWSE = "browse";
|
||||
public final static String OUTCOME_MYALFRESCO = "myalfresco";
|
||||
public final static String OUTCOME_LOGOUT = "logout";
|
||||
|
||||
private static final String ARG_TEMPLATE = "template";
|
||||
private static final String ARG_PAGE = "page";
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
|
||||
@@ -224,6 +227,19 @@ public class ExternalAccessServlet extends BaseServlet
|
||||
navigationHandler.handleNavigation(fc, null, outcome);
|
||||
}
|
||||
}
|
||||
else if (OUTCOME_MYALFRESCO.equals(outcome))
|
||||
{
|
||||
// setup the Dashboard Manager ready for the page we want to display
|
||||
if (req.getParameter(ARG_PAGE) != null)
|
||||
{
|
||||
DashboardManager manager = (DashboardManager)FacesHelper.getManagedBean(fc, "DashboardManager");
|
||||
manager.getPageConfig().setCurrentPage(req.getParameter(ARG_PAGE));
|
||||
}
|
||||
|
||||
// perform the appropriate JSF navigation outcome
|
||||
NavigationHandler navigationHandler = fc.getApplication().getNavigationHandler();
|
||||
navigationHandler.handleNavigation(fc, null, outcome);
|
||||
}
|
||||
else if (OUTCOME_LOGOUT.equals(outcome))
|
||||
{
|
||||
// special case for logout
|
||||
|
Reference in New Issue
Block a user