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 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 a67dce2f5e
commit e6f28374a5
4 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/action/scheduled/FreeMarkerWithLuceneExtensionsModelFactory.java
View File

@@ -104,7 +104,7 @@ public class FreeMarkerWithLuceneExtensionsModelFactory implements TemplateActio
{
Map<String, Object> model = getModel();
TemplateNode companyRootNode = new TemplateNode(nodeRef, serviceRegistry);
TemplateNode companyRootNode = new TemplateNode(nodeRef, serviceRegistry, null);
model.put("node", companyRootNode);
return model;