From d4df23ea309d00be031f62a8650a106aad747876 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 19 Dec 2006 17:30:05 +0000 Subject: [PATCH] Merged 1.4 to HEAD (Repo and other pieces for support of Records Management) svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4617 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/web-client@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/web-client@4617 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/common@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/common@4617 . svn revert common.properties Manually carried common.properties file changes over git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/app/servlet/command/ExecuteScriptCommand.java | 4 +--- 1 file changed, 1 insertion(+), 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 6255c33c4b..7848c8b68c 100644 --- a/source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java +++ b/source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java @@ -25,7 +25,6 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; -import org.alfresco.web.ui.repo.component.template.DefaultModelHelper; /** * Execute Script command implementation. @@ -89,8 +88,7 @@ public final class ExecuteScriptCommand implements Command (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER), scriptRef, docRef, - spaceRef, - DefaultModelHelper.imageResolver); + spaceRef); // add the url arguments map model.put("args", properties.get(PROP_ARGS));