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

Afternoon merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-17 22:42:03 +00:00
parent 009fd6f36f
commit e18a26f4f3
72 changed files with 1300 additions and 5517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
View File

@@ -306,9 +306,10 @@ public class ClipboardBean
if (logger.isDebugEnabled())
logger.debug("Attempting to copy node ID: " + item.Node.getId() + " into node ID: " + destRef.getId());
if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_CONTENT))
if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_CONTENT) ||
dd.isSubClass(item.Node.getType(), ContentModel.TYPE_FOLDER))
{
// call the node ops service to initiate the copy
// copy the file/folder
this.fileFolderService.copy(
item.Node.getNodeRef(),
destRef,
@@ -316,6 +317,7 @@ public class ClipboardBean
}
else
{
// copy the node
this.copyService.copy(
item.Node.getNodeRef(),
destRef,
@@ -330,13 +332,14 @@ public class ClipboardBean
if (logger.isDebugEnabled())
logger.debug("Attempting to move node ID: " + item.Node.getId() + " into node ID: " + destRef.getId());
if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_CONTENT))
if (dd.isSubClass(item.Node.getType(), ContentModel.TYPE_CONTENT) ||
dd.isSubClass(item.Node.getType(), ContentModel.TYPE_FOLDER))
{
// move the node
// move the file/folder
this.fileFolderService.move(
item.Node.getNodeRef(),
destRef,
name); // TODO: could add "Copy of ..." here if move fails
name);
}
else
{