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 DEV/CHECK_EXISTS to HEAD

Browse Source 
svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/DEV/CHECK_EXISTS@3442 svn://www.alfresco.org:3691/alfresco/BRANCHES/DEV/CHECK_EXISTS@3590 .

TODO: Fix bug raising incorrect exception during UI paste of same-named file
Note:
- Added a new method to NodeService to get child by name
- Added a new method to FileFolderService to perform fast, direct lookups based on name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-08-23 16:50:12 +00:00
parent dddb90898a
commit 39687f35f2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
View File

@@ -262,7 +262,7 @@ public class DocumentPropertiesBean
String statusMsg = MessageFormat.format( String statusMsg = MessageFormat.format(
Application.getMessage( Application.getMessage(
FacesContext.getCurrentInstance(), "error_exists"), FacesContext.getCurrentInstance(), "error_exists"),
e.getExisting().getName()); e.getName());
Utils.addErrorMessage(statusMsg); Utils.addErrorMessage(statusMsg);
// no outcome // no outcome
outcome = null; outcome = null;

2
source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
View File

@@ -198,7 +198,7 @@ public class EditContentPropertiesDialog extends BaseDialogBean
{ {
return MessageFormat.format(Application.getMessage( return MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS), FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS),
((FileExistsException)exception).getExisting().getName()); ((FileExistsException)exception).getName());
} }
else if (exception instanceof InvalidNodeRefException) else if (exception instanceof InvalidNodeRefException)
{ {

2
source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
View File

@@ -712,7 +712,7 @@ public class CreateSpaceWizard extends BaseWizardBean
{ {
return MessageFormat.format(Application.getMessage( return MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS), FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS),
((FileExistsException)exception).getExisting().getName()); ((FileExistsException)exception).getName());
} }
else else
{ {