- Remainder of app now uses dialog framework for delete pages

- 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

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)
{

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;
}