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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
58408: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58267: MNT-7514 : Merged DEV to V4.2-BUG-FIX
       58142 : MNT-7514 : Uninformational error message on move when file name conflicts
        Added new failure message if file exists. 
       58263 : MNT-7514 : Uninformational error message on move when file name conflicts
        Was corrected showing failure message for copy/move a file or folder. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:29:14 +00:00
parent f29166271d
commit 135625b740
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -70,6 +70,7 @@ import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.lock.LockStatus;
import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
@@ -2156,6 +2157,11 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
{
this.services.getFileFolderService().moveFrom(this.nodeRef, source.getNodeRef(), destination.getNodeRef(), null);
}
//MNT-7514 Uninformational error message on move when file name conflicts
catch (FileExistsException ex)
{
throw ex;
}
catch (Exception e)
{
throw new ScriptException("Can't move node", e);