inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V1.3 to HEAD (3226:3232)

Browse Source 
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
This commit is contained in:
Derek Hulley
2006-07-26 11:05:04 +00:00
parent 4e18df8f63
commit a39720a3ff
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/action/executer/ScriptActionExecutor.java
View File

@@ -38,7 +38,6 @@ public class ScriptActionExecutor extends ActionExecuterAbstractBase
{ {
public static final String NAME = "script"; public static final String NAME = "script";
public static final String PARAM_SCRIPTREF = "script-ref"; public static final String PARAM_SCRIPTREF = "script-ref";
public static final String PARAM_SPACEREF = "space-ref";
private ServiceRegistry serviceRegistry; private ServiceRegistry serviceRegistry;
private PersonService personService; private PersonService personService;
@@ -80,12 +79,7 @@ public class ScriptActionExecutor extends ActionExecuterAbstractBase
if (nodeService.exists(actionedUponNodeRef)) if (nodeService.exists(actionedUponNodeRef))
{ {
NodeRef scriptRef = (NodeRef)action.getParameterValue(PARAM_SCRIPTREF); NodeRef scriptRef = (NodeRef)action.getParameterValue(PARAM_SCRIPTREF);
NodeRef spaceRef = (NodeRef)action.getParameterValue(PARAM_SPACEREF); NodeRef spaceRef = (NodeRef)action.getOwningNodeRef();
if (spaceRef == null)
{
// get primary parent of the doc as no space has been specified
spaceRef = nodeService.getPrimaryParent(actionedUponNodeRef).getParentRef();
}
if (nodeService.exists(scriptRef)) if (nodeService.exists(scriptRef))
{ {
@@ -120,7 +114,6 @@ public class ScriptActionExecutor extends ActionExecuterAbstractBase
protected void addParameterDefinitions(List<ParameterDefinition> paramList) protected void addParameterDefinitions(List<ParameterDefinition> paramList)
{ {
paramList.add(new ParameterDefinitionImpl(PARAM_SCRIPTREF, DataTypeDefinition.NODE_REF, true, getParamDisplayLabel(PARAM_SCRIPTREF))); 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() private NodeRef getCompanyHome()