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

Fix for http://issues.alfresco.com/browse/AWC-1108

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-01-31 11:38:44 +00:00
parent a6d4684034
commit 5cdfa838d9
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/app/servlet/BaseTemplateContentServlet.java
View File

@@ -295,7 +295,7 @@ public abstract class BaseTemplateContentServlet extends BaseServlet
}
/** Template Image resolver helper */
private TemplateImageResolver imageResolver = new TemplateImageResolver()
protected TemplateImageResolver imageResolver = new TemplateImageResolver()
{
public String resolveImagePathForName(String filename, boolean small)
{

2
source/java/org/alfresco/web/app/servlet/GuestTemplateContentServlet.java
View File

@@ -111,7 +111,7 @@ public class GuestTemplateContentServlet extends BaseTemplateContentServlet
guestUser.setHomeSpaceId(guestHomeRef.getId());
// build the default model
return DefaultModelHelper.buildDefaultModel(services, guestUser, templateRef);
return DefaultModelHelper.buildDefaultModel(services, guestUser, templateRef, this.imageResolver);
}
/**

2
source/java/org/alfresco/web/app/servlet/TemplateContentServlet.java
View File

@@ -84,7 +84,7 @@ public class TemplateContentServlet extends BaseTemplateContentServlet
NodeRef templateRef)
{
return DefaultModelHelper.buildDefaultModel(services,
Application.getCurrentUser(req.getSession()), templateRef);
Application.getCurrentUser(req.getSession()), templateRef, this.imageResolver);
}
/**

24
source/java/org/alfresco/web/ui/repo/component/template/DefaultModelHelper.java
View File

@@ -55,11 +55,31 @@ public class DefaultModelHelper
* Other root level objects such as the current Space or Document are generally
* added by the appropriate bean responsible for provided access to those nodes.
* <p>
* Uses the default TemplateImageResolver instance to resolve icons - assumes that the client
* has a valid FacesContext.
* <p>
* See {@link http://www.alfresco.org/mediawiki/index.php/Template_Guide}
*
* @return Map containing the default model.
*/
public static Map<String, Object> buildDefaultModel(ServiceRegistry services, User user, NodeRef template)
public static Map<String, Object> buildDefaultModel(
ServiceRegistry services, User user, NodeRef template)
{
return buildDefaultModel(services, user, template, imageResolver);
}
/**
* Construct the default FreeMarker template model.
* <p>
* Other root level objects such as the current Space or Document are generally
* added by the appropriate bean responsible for provided access to those nodes.
* <p>
* See {@link http://www.alfresco.org/mediawiki/index.php/Template_Guide}
*
* @return Map containing the default model.
*/
public static Map<String, Object> buildDefaultModel(
ServiceRegistry services, User user, NodeRef template, TemplateImageResolver resolver)
{
if (services == null)
{
@@ -74,7 +94,7 @@ public class DefaultModelHelper
NodeRef userRootRef = new NodeRef(Repository.getStoreRef(), user.getHomeSpaceId());
return FreeMarkerProcessor.buildDefaultModel(
services, user.getPerson(), companyRootRef, userRootRef, template, imageResolver);
services, user.getPerson(), companyRootRef, userRootRef, template, resolver);
}
/** Template Image resolver helper */