From 3602a7c989faae7707ee7c8239b39cc3ddd9212c Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 23 Jun 2009 14:34:50 +0000 Subject: [PATCH] Merged V3.1 to HEAD 14628: Second attempt at ETHREEOH-2144 fix - tested against several known good webforms. 14854: Fix for ETHREEOH-2206. Also fixes minor issue where rule condition selection box was not reset after adding a condition to a composite. 14862: Fix for ETHREEOH-1946 - correctly coerce nodes returned from javascript into AVMTemplateNode objects if they are AVM NodeRef objects. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/template/FreeMarkerProcessor.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java index 10c72d9a39..8a05bf8b32 100644 --- a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java +++ b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java @@ -35,6 +35,7 @@ import org.alfresco.processor.ProcessorExtension; import org.alfresco.repo.processor.BaseProcessor; import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.TemplateException; import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.cmr.repository.TemplateProcessor; @@ -329,7 +330,15 @@ public class FreeMarkerProcessor extends BaseProcessor implements TemplateProces { if (value instanceof NodeRef) { - return new TemplateNode((NodeRef)value, this.services, imageResolver); + NodeRef ref = (NodeRef)value; + if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol())) + { + return new AVMTemplateNode((NodeRef)value, this.services, imageResolver); + } + else + { + return new TemplateNode((NodeRef)value, this.services, imageResolver); + } } else if (value instanceof AssociationRef)