inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V3.3-BUG-FIX to HEAD:

Browse Source 
21646: ALF-3752: Getting Parent on a specific version throws exception
   21655: Fix ALF-4006: Incorrect search result after renaming a folder
   21634: Fix ALF-3822: Storing of datetime does not work

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-08-06 14:24:02 +00:00
parent a36decbb8e
commit 681c9b6785
4 changed files with 20 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java
View File

@@ -347,7 +347,11 @@ public class DMNavigationServicePort extends DMAbstractServicePort implements Na
List<NodeRef> parents = new LinkedList<NodeRef>();
for (ChildAssociationRef childParentAssociation : nodeService.getParentAssocs(objectId))
{
parents.add(childParentAssociation.getParentRef());
NodeRef parentRef = childParentAssociation.getParentRef();
if (!parentRef.equals(nodeService.getRootNode(parentRef.getStoreRef())))
{
parents.add(parentRef);
}
}
return parents;
}

6
source/java/org/alfresco/repo/cmis/ws/utils/PropertyUtil.java
View File

@@ -208,6 +208,12 @@ public class PropertyUtil
else if (cmisProperty instanceof CmisPropertyDateTime)
{
convertedValue = ((CmisPropertyDateTime) cmisProperty).getValue();
List<GregorianCalendar> dates = new ArrayList<GregorianCalendar>(convertedValue.size());
for (Object date : convertedValue)
{
dates.add(((XMLGregorianCalendar)date).toGregorianCalendar());
}
convertedValue = dates;
}
else if (cmisProperty instanceof CmisPropertyDecimal)
{