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 V3.2E to HEAD

Browse Source 
17635: Complete fix for ETHREEOH-2879 - user with missing first/last name able to use Discussions, Blogs, Links etc. in Share.
   17637: Fix regression from r17601: Favourite sites in header menu.
   17638: Fix ETHREEOH-3610 - upgrade Enterprise 2.x -> 3.2 (personUsagePatch)
   17641: ETHREEOH-3612 Security Issue : DeploymentTarget uses String to represent passwords
   17642: Fix for ETHREEOH-3482 - Impossible to delete content from its details page.
          - regression due to the "AbortProcessingException" changes added a while back.
   17660: Minor functional fixes for mobile app and cleanup
   17663: Fixed ETHREEOH-3664 "'My Tasks' dashlet could not load task list if a user was invited to a private site"
            - When webscript accessed a private site undefined was returned so the title and description couldn't be displayed, now the values are store on the invite task instead.
   17665: Fix up compile errors from r17663 - also clean up old code to coding standards in related invite classes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-20 10:51:08 +00:00
parent d111cb3f1c
commit 984ee0a2aa
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ import org.apache.commons.logging.LogFactory;
public class AlfrescoNavigationHandler extends NavigationHandler
{
public final static String OUTCOME_SEPARATOR = ":";
public final static String OUTCOME_BROWSE = "browse";
public final static String DIALOG_PREFIX = "dialog" + OUTCOME_SEPARATOR;
public final static String WIZARD_PREFIX = "wizard" + OUTCOME_SEPARATOR;
public final static String CLOSE_DIALOG_OUTCOME = DIALOG_PREFIX + "close";
@@ -762,28 +763,35 @@ public class AlfrescoNavigationHandler extends NavigationHandler
// an overidden outcome as we could be going anywhere in the app.
// grab the current top item first though in case we need to open
// another dialog or wizard
String previousViewId = getViewIdFromStackObject(context, getViewStack(context).peek());
getViewStack(context).clear();
if (logger.isDebugEnabled())
logger.debug("Closing " + closingItem + " with an overridden outcome of '" + overriddenOutcome + "'");
// if the override is calling another dialog or wizard come back through
// the navigation handler from the beginning
if (isDialog(overriddenOutcome) || isWizard(overriddenOutcome))
if (OUTCOME_BROWSE.equals(overriddenOutcome) == false)
{
// set the view id to the page at the top of the stack so when
// the new dialog or wizard closes it goes back to the correct page
context.getViewRoot().setViewId(previousViewId);
String previousViewId = getViewIdFromStackObject(context, getViewStack(context).peek());
getViewStack(context).clear();
if (logger.isDebugEnabled())
{
logger.debug("view stack: " + getViewStack(context));
logger.debug("Opening '" + overriddenOutcome + "' after " + closingItem +
" close using view id: " + previousViewId);
}
logger.debug("Closing " + closingItem + " with an overridden outcome of '" + overriddenOutcome + "'");
this.handleNavigation(context, fromAction, overriddenOutcome);
// if the override is calling another dialog or wizard come back through
// the navigation handler from the beginning
if (isDialog(overriddenOutcome) || isWizard(overriddenOutcome))
{
// set the view id to the page at the top of the stack so when
// the new dialog or wizard closes it goes back to the correct page
context.getViewRoot().setViewId(previousViewId);
if (logger.isDebugEnabled())
{
logger.debug("view stack: " + getViewStack(context));
logger.debug("Opening '" + overriddenOutcome + "' after " + closingItem +
" close using view id: " + previousViewId);
}
this.handleNavigation(context, fromAction, overriddenOutcome);
}
else
{
navigate(context, fromAction, overriddenOutcome);
}
}
else
{
@@ -800,7 +808,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler
logger.debug("Attempting to close a " + closingItem + " with an empty view stack, returning 'browse' outcome");
}
navigate(context, fromAction, "browse");
navigate(context, fromAction, OUTCOME_BROWSE);
}
}