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

Fix to issue found by KevinC where a wizard launched in the "plain" container would revert to default container after first page displayed.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-07-12 14:48:39 +00:00
parent 799603d337
commit 2c2d87914b
6 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java
View File

@@ -60,7 +60,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler
public final static String WIZARD_PREFIX = "wizard" + OUTCOME_SEPARATOR;
public final static String CLOSE_DIALOG_OUTCOME = DIALOG_PREFIX + "close";
public final static String CLOSE_WIZARD_OUTCOME = WIZARD_PREFIX + "close";
public final static String EXTERNAL_CONTAINER_REQUEST = "externalContainerRequest";
public final static String EXTERNAL_CONTAINER_SESSION = "externalDialogContainer";
protected String dialogContainer = null;
protected String wizardContainer = null;
@@ -371,8 +371,8 @@ public class AlfrescoNavigationHandler extends NavigationHandler
String container;
// determine which kind of container we need to return, if the
// external request flag is set then use the plain container
Object obj = context.getExternalContext().getRequestMap().get(EXTERNAL_CONTAINER_REQUEST);
// external session flag is set then use the plain container
Object obj = context.getExternalContext().getSessionMap().get(EXTERNAL_CONTAINER_SESSION);
if (obj != null && obj instanceof Boolean && ((Boolean)obj).booleanValue())
{
@@ -422,8 +422,8 @@ public class AlfrescoNavigationHandler extends NavigationHandler
String container;
// determine which kind of container we need to return, if the
// external request flag is set then use the plain container
Object obj = context.getExternalContext().getRequestMap().get(EXTERNAL_CONTAINER_REQUEST);
// external session flag is set then use the plain container
Object obj = context.getExternalContext().getSessionMap().get(EXTERNAL_CONTAINER_SESSION);
if (obj != null && obj instanceof Boolean && ((Boolean)obj).booleanValue())
{