inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
118306 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
         - Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 17:29:42 +00:00
parent 75c5da59d8
commit c2e645b2ae
2 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuter.java
View File

@@ -28,6 +28,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.CopyService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -144,17 +145,13 @@ public class TransitionSimpleWorkflowActionExecuter extends ActionExecuterAbstra
else
{
// copy the node to the specified folder
String qname = QName.createValidLocalName(name);
NodeRef newNode = copyService.copy(
ChildAssociationRef originalAssoc = nodeService.getPrimaryParent(actionedUponNodeRef);
copyService.copyAndRename(
actionedUponNodeRef,
destinationFolder,
ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, qname),
originalAssoc.getTypeQName(),
originalAssoc.getQName(),
true);
// the copy service does not copy the name of the node so we
// need to update the property on the copied item
nodeService.setProperty(newNode, ContentModel.PROP_NAME, name);
}
}
}