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

- Remainder of app now uses dialog framework for delete pages

Browse Source 
- Fixed bug in edit space (any type) where the icon would not be pre-set to the current one

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2005-12-22 14:23:25 +00:00
parent a4564a1a49
commit 62ae60eaf6
8 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,11 @@ public class AlfrescoNavigationHandler extends NavigationHandler
{
// there is an overidden outcome so extract it
outcome = outcome.substring(idx+1, outcome.length());
// we also need to empty the dialog stack if we have been given
// an overidden outcome as we could be going anywhere in the app
getViewStack(context).clear();
if (logger.isDebugEnabled())
logger.debug("Closing dialog with an overridden outcome of '" + outcome + "'");
@@ -123,15 +127,10 @@ public class AlfrescoNavigationHandler extends NavigationHandler
// log a warning and return a null outcome to stay on the same page
if (logger.isWarnEnabled())
{
logger.warn("Attempting to close a dialog with an empty view stack, returning 'browse' outcome");
logger.warn("Attempting to close a dialog with an empty view stack, returning null outcome");
}
// TODO: change this back to returning null outcome as that
// will highlight any areas we have neglected to launch
// in a dilaog, for backwards compatibility for the short
// term return 'browse' outcome.
this.origHandler.handleNavigation(context, fromAction, "browse");
this.origHandler.handleNavigation(context, fromAction, null);
}
}
else

6
source/java/org/alfresco/web/bean/BrowseBean.java
View File

@@ -1181,7 +1181,8 @@ public class BrowseBean implements IContextListener
setActionSpace(null);
// setting the outcome will show the browse view again
outcome = "browse";
outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
AlfrescoNavigationHandler.DIALOG_SEPARATOR + "browse";
}
catch (Throwable err)
{
@@ -1220,7 +1221,8 @@ public class BrowseBean implements IContextListener
setDocument(null);
// setting the outcome will show the browse view again
outcome = "browse";
outcome = AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
AlfrescoNavigationHandler.DIALOG_SEPARATOR + "browse";
}
catch (Throwable err)
{

6
source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java
View File

@@ -709,7 +709,11 @@ public class NewSpaceWizard extends AbstractWizardBean
// the first icon in the list the default
icons = new ArrayList<UIListItem>(iconsCfg.getChildCount());
this.icon = iconName;
if (this.icon == null)
{
// set the default if it is not already
this.icon = iconName;
}
first = false;
}