From a39720a3ffa64880e3d955598985605e71cf20b3 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 26 Jul 2006 11:05:04 +0000 Subject: [PATCH] Merged V1.3 to HEAD (3226:3232) svn merge svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3226 svn://www.alfresco.org:3691/alfresco/BRANCHES/V1.3@3232 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/action/executer/ScriptActionExecutor.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/source/java/org/alfresco/repo/action/executer/ScriptActionExecutor.java b/source/java/org/alfresco/repo/action/executer/ScriptActionExecutor.java index e9ba2b2363..cd3210cf6c 100644 --- a/source/java/org/alfresco/repo/action/executer/ScriptActionExecutor.java +++ b/source/java/org/alfresco/repo/action/executer/ScriptActionExecutor.java @@ -38,7 +38,6 @@ public class ScriptActionExecutor extends ActionExecuterAbstractBase { public static final String NAME = "script"; public static final String PARAM_SCRIPTREF = "script-ref"; - public static final String PARAM_SPACEREF = "space-ref"; private ServiceRegistry serviceRegistry; private PersonService personService; @@ -80,12 +79,7 @@ public class ScriptActionExecutor extends ActionExecuterAbstractBase if (nodeService.exists(actionedUponNodeRef)) { NodeRef scriptRef = (NodeRef)action.getParameterValue(PARAM_SCRIPTREF); - NodeRef spaceRef = (NodeRef)action.getParameterValue(PARAM_SPACEREF); - if (spaceRef == null) - { - // get primary parent of the doc as no space has been specified - spaceRef = nodeService.getPrimaryParent(actionedUponNodeRef).getParentRef(); - } + NodeRef spaceRef = (NodeRef)action.getOwningNodeRef(); if (nodeService.exists(scriptRef)) { @@ -120,7 +114,6 @@ public class ScriptActionExecutor extends ActionExecuterAbstractBase protected void addParameterDefinitions(List paramList) { paramList.add(new ParameterDefinitionImpl(PARAM_SCRIPTREF, DataTypeDefinition.NODE_REF, true, getParamDisplayLabel(PARAM_SCRIPTREF))); - paramList.add(new ParameterDefinitionImpl(PARAM_SPACEREF, DataTypeDefinition.NODE_REF, false, getParamDisplayLabel(PARAM_SPACEREF))); } private NodeRef getCompanyHome()