From b9da3745537eb8a0e2f60eea8f010a047114a02a Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 10 May 2006 16:24:03 +0000 Subject: [PATCH] . Fix to Script command processor git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2815 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/app/servlet/command/ExecuteScriptCommand.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java b/source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java index bfca600c94..f0c139e8b5 100644 --- a/source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java +++ b/source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java @@ -71,18 +71,23 @@ public final class ExecuteScriptCommand implements Command "Unable to execute ExecuteScriptCommand - mandatory parameter not supplied: " + PROP_USERPERSON); } - // get the optional document context ref + // get the optional document and space context ref + NodeService nodeService = serviceRegistry.getNodeService(); NodeRef docRef = (NodeRef)properties.get(PROP_DOCUMENT); + NodeRef spaceRef = null; + if (docRef != null) + { + spaceRef = nodeService.getPrimaryParent(docRef).getParentRef(); + } // build the model needed to execute the script - NodeService nodeService = serviceRegistry.getNodeService(); Map model = RhinoScriptService.buildDefaultModel( serviceRegistry, personRef, new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId()), (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER), docRef, - nodeService.getPrimaryParent(docRef).getParentRef(), + spaceRef, DefaultModelHelper.imageResolver); // execute the script and return the result