From aa1fd122087db920943916f5753d774beec0cebc Mon Sep 17 00:00:00 2001 From: Sylvain Jermini Date: Tue, 18 Oct 2016 12:53:43 +0200 Subject: [PATCH] #213 cleanup --- src/main/java/alfio/util/TemplateManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/alfio/util/TemplateManager.java b/src/main/java/alfio/util/TemplateManager.java index 1be058bb29..01c15ef798 100644 --- a/src/main/java/alfio/util/TemplateManager.java +++ b/src/main/java/alfio/util/TemplateManager.java @@ -122,25 +122,26 @@ public TemplateManager(JMustacheTemplateLoader templateLoader, } public String renderTemplate(TemplateResource templateResource, Map model, Locale locale, TemplateOutput templateOutput) { - return render(new ClassPathResource(templateResource.classPath()), templateResource.classPath(), model, locale, templateOutput, true); + return render(new ClassPathResource(templateResource.classPath()), model, locale, templateOutput); } public String renderTemplate(Event event, TemplateResource templateResource, Map model, Locale locale, TemplateOutput templateOutput) { + //FIXME add here cascading logic for finding the template return renderTemplate(templateResource, model, locale, templateOutput); } public String renderString(String template, Map model, Locale locale, TemplateOutput templateOutput) { - return render(new ByteArrayResource(template.getBytes(StandardCharsets.UTF_8)), "", model, locale, templateOutput, false); + return render(new ByteArrayResource(template.getBytes(StandardCharsets.UTF_8)), model, locale, templateOutput); } //TODO: to be removed when only the rest api will be exposed public String renderServletContextResource(String servletContextResource, Map model, HttpServletRequest request, TemplateOutput templateOutput) { model.put("request", request); model.put(WebSecurityConfig.CSRF_PARAM_NAME, request.getAttribute(CsrfToken.class.getName())); - return render(new ServletContextResource(request.getServletContext(), servletContextResource), servletContextResource, model, RequestContextUtils.getLocale(request), templateOutput, true); + return render(new ServletContextResource(request.getServletContext(), servletContextResource), model, RequestContextUtils.getLocale(request), templateOutput); } - private String render(AbstractResource resource, String key, Map model, Locale locale, TemplateOutput templateOutput, boolean cachingRequested) { + private String render(AbstractResource resource, Map model, Locale locale, TemplateOutput templateOutput) { try { ModelAndView mv = new ModelAndView((String) null, model); mv.addObject("format-date", MustacheCustomTagInterceptor.FORMAT_DATE);