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

Merged 1.4 to HEAD (Repo and other pieces for support of Records Management)

Browse Source 
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
This commit is contained in:
Derek Hulley
2006-12-19 17:30:05 +00:00
parent 8d32a6073d
commit d4df23ea30
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/web/app/servlet/command/ExecuteScriptCommand.java
View File

@@ -25,7 +25,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.web.app.Application; import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.repo.component.template.DefaultModelHelper;
/** /**
* Execute Script command implementation. * Execute Script command implementation.
@@ -89,8 +88,7 @@ public final class ExecuteScriptCommand implements Command
(NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER), (NodeRef)nodeService.getProperty(personRef, ContentModel.PROP_HOMEFOLDER),
scriptRef, scriptRef,
docRef, docRef,
spaceRef, spaceRef);
DefaultModelHelper.imageResolver);
// add the url arguments map // add the url arguments map
model.put("args", properties.get(PROP_ARGS)); model.put("args", properties.get(PROP_ARGS));