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

- 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

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

@@ -111,6 +111,10 @@ 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;
}

6
source/web/jsp/browse/browse.jsp
View File

@@ -107,7 +107,7 @@
<f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6" />
</a:actionLink>
<r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval4">
<a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
<a:actionLink value="#{msg.delete_space}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}" id="link2">
<f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
</a:actionLink>
<a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" id="link6" actionListener="#{ClipboardBean.cutNode}">
@@ -311,7 +311,7 @@
<f:param name="id" value="#{r.id}" />
</a:actionLink>
<r:permissionEvaluator value="#{r}" allow="Delete">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupDeleteAction}">
<f:param name="id" value="#{r.id}" />
</a:actionLink>
</r:permissionEvaluator>
@@ -479,7 +479,7 @@
</a:actionLink>
<r:permissionEvaluator value="#{r}" allow="Delete">
<a:booleanEvaluator value="#{r.locked == false && r.workingCopy == false}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" showLink="false" styleClass="inlineAction" actionListener="#{BrowseBean.setupContentAction}" action="dialog:deleteFile">
<f:param name="id" value="#{r.id}" />
</a:actionLink>
</a:booleanEvaluator>

2
source/web/jsp/dialog/delete-file.jsp
View File

@@ -127,7 +127,7 @@
<tr><td class="dialogButtonSpacing"></td></tr>
<tr>
<td align="center">
<h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
<h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
</td>
</tr>
</table>

2
source/web/jsp/dialog/delete-space.jsp
View File

@@ -143,7 +143,7 @@
<tr><td class="dialogButtonSpacing"></td></tr>
<tr>
<td align="center">
<h:commandButton value="#{msg.no}" action="browse" styleClass="dialogControls" />
<h:commandButton value="#{msg.no}" action="dialog:close" styleClass="dialogControls" />
</td>
</tr>
</table>

4
source/web/jsp/dialog/document-details.jsp
View File

@@ -153,7 +153,7 @@
<r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Delete">
<a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif"
actionListener="#{BrowseBean.setupContentAction}" action="deleteFile">
actionListener="#{BrowseBean.setupContentAction}" action="dialog:deleteFile">
<f:param name="id" value="#{DocumentDetailsBean.id}" />
</a:actionLink>
</a:booleanEvaluator>
@@ -441,7 +441,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr>
<td align="center">
<h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
<h:commandButton value="#{msg.close}" action="dialog:close" styleClass="wizardButton" />
</td>
</tr>
</table>

2
source/web/jsp/dialog/space-details.jsp
View File

@@ -88,7 +88,7 @@
<f:param name="id" value="#{SpaceDetailsBean.id}" />
</a:actionLink>
<r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
<a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
<f:param name="id" value="#{SpaceDetailsBean.id}" />
</a:actionLink>
</r:permissionEvaluator>