mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 . svn revert root\common\common.xml svn resolved root\projects\repository\config\alfresco\script-services-context.xml git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -23,7 +23,10 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.mozilla.javascript.Context;
|
||||
import org.mozilla.javascript.NativeArray;
|
||||
@@ -38,7 +41,6 @@ import org.mozilla.javascript.Wrapper;
|
||||
*/
|
||||
public class ValueConverter
|
||||
{
|
||||
|
||||
/**
|
||||
* Convert an object from any repository serialized value to a valid script object.
|
||||
* This includes converting Collection multi-value properties into JavaScript Array objects.
|
||||
@@ -63,6 +65,18 @@ public class ValueConverter
|
||||
// so they can be used as objects within a template
|
||||
value = new Node(((NodeRef)value), services, null, scope);
|
||||
}
|
||||
else if (value instanceof QName || value instanceof StoreRef)
|
||||
{
|
||||
value = value.toString();
|
||||
}
|
||||
else if (value instanceof ChildAssociationRef)
|
||||
{
|
||||
value = new ChildAssociation(services, (ChildAssociationRef)value, scope);
|
||||
}
|
||||
else if (value instanceof AssociationRef)
|
||||
{
|
||||
value = new Association(services, (AssociationRef)value, scope);
|
||||
}
|
||||
else if (value instanceof Date)
|
||||
{
|
||||
// convert Date to JavaScript native Date object
|
||||
@@ -110,6 +124,14 @@ public class ValueConverter
|
||||
// convert back to NodeRef
|
||||
value = ((Node)value).getNodeRef();
|
||||
}
|
||||
else if (value instanceof ChildAssociation)
|
||||
{
|
||||
value = ((ChildAssociation)value).getChildAssociationRef();
|
||||
}
|
||||
else if (value instanceof Association)
|
||||
{
|
||||
value = ((Association)value).getAssociationRef();
|
||||
}
|
||||
else if (value instanceof Wrapper)
|
||||
{
|
||||
// unwrap a Java object from a JavaScript wrapper
|
||||
|
Reference in New Issue
Block a user