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

Merge V3.2 To HEAD

Browse Source 
17834: Fix for ETHREEOH-3613. Now you can add two different pieces of content with the same name to a package.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2010-01-21 17:22:18 +00:00
parent 4d31a35d31
commit d2796c513b
2 changed files with 896 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1655
source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java
View File

File diff suppressed because it is too large Load Diff

2
source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java
View File

@@ -207,7 +207,7 @@ public class StartWorkflowWizard extends BaseWizardBean
{ {
NodeRef addedNodeRef = new NodeRef(addedItem); NodeRef addedNodeRef = new NodeRef(addedItem);
this.getUnprotectedNodeService().addChild(workflowPackage, addedNodeRef, this.getUnprotectedNodeService().addChild(workflowPackage, addedNodeRef,
ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, WorkflowModel.ASSOC_PACKAGE_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
QName.createValidLocalName((String)this.getNodeService().getProperty( QName.createValidLocalName((String)this.getNodeService().getProperty(
addedNodeRef, ContentModel.PROP_NAME)))); addedNodeRef, ContentModel.PROP_NAME))));
} }