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

Merging BRANCHES/DEV/CMIS_10 to HEAD (phase 2 - currently up-to-date with branch):

Browse Source 
18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently
   18731: SAIL-169: CMIS REST versioning compliance
   18732: Fix failing change log test.
   18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding).
   18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding).
   18784: Fix CMIS REST change logging
   18785: SAIL-174: CMIS Relationship lookup by association ID
   18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings
   18823: CMIS WS Bindings were moved to 1.0 cd07 schema.
   18838: Update to latest Chemistry TCK.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-02-25 15:02:44 +00:00
parent 03e7add24a
commit b3cb4d3953
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/ui/repo/component/property/UIAssociationEditor.java
View File

@@ -235,7 +235,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
if (node != null && targetRef != null)
{
QName assocQName = Repository.resolveToQName(this.associationName);
AssociationRef newAssoc = new AssociationRef(node.getNodeRef(), assocQName, new NodeRef(targetRef));
AssociationRef newAssoc = new AssociationRef(null, node.getNodeRef(), assocQName, new NodeRef(targetRef));
// update the node so it knows to remove the association, but only if the association
// was one of the original ones
@@ -279,7 +279,7 @@ public class UIAssociationEditor extends BaseAssociationEditor
if (this.originalAssocs.containsKey(targetRef) == false)
{
QName assocQName = Repository.resolveToQName(this.associationName);
AssociationRef newAssoc = new AssociationRef(node.getNodeRef(), assocQName,
AssociationRef newAssoc = new AssociationRef(null, node.getNodeRef(), assocQName,
new NodeRef(targetRef));
Map<String, AssociationRef> added = node.getAddedAssociations().get(this.associationName);