inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

- New edit properties dialog used when new content is added/created

Browse Source 
- Minor fixes/enhancements

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-05-10 08:54:14 +00:00
parent 7f6fabb0b6
commit c953c45c3d
26 changed files with 711 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,7 +528,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler
}
else
{
logger.warn("Failed to find configuration for dialog '" + name + "'");
//logger.warn("Failed to find configuration for dialog '" + name + "'");
// send the dialog name as the outcome to the original handler
handleDispatch(context, fromAction, name);
@@ -565,7 +565,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler
}
else
{
logger.warn("Failed to find configuration for wizard '" + name + "'");
//logger.warn("Failed to find configuration for wizard '" + name + "'");
// send the dialog name as the outcome to the original handler
handleDispatch(context, fromAction, name);
@@ -610,7 +610,16 @@ public class AlfrescoNavigationHandler extends NavigationHandler
if (logger.isDebugEnabled())
logger.debug("Closing " + closingItem + " with an overridden outcome of '" + overriddenOutcome + "'");
navigate(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))
{
this.handleNavigation(context, fromAction, overriddenOutcome);
}
else
{
navigate(context, fromAction, overriddenOutcome);
}
}
}
else