Commit 17fbc135 authored by Liang Ding's avatar Liang Ding

#12615

parent ce8072d1
...@@ -93,10 +93,7 @@ public class ErrorProcessor { ...@@ -93,10 +93,7 @@ public class ErrorProcessor {
LOGGER.log(Level.TRACE, "Shows error page[requestURI={0}, templateName={1}]", LOGGER.log(Level.TRACE, "Shows error page[requestURI={0}, templateName={1}]",
requestURI, templateName); requestURI, templateName);
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "error/" + templateName);
context.setRenderer(renderer);
renderer.setTemplateName("error/" + templateName);
final Map<String, Object> dataModel = renderer.getDataModel(); final Map<String, Object> dataModel = renderer.getDataModel();
try { try {
final Map<String, String> langs = langPropsService.getAll(Locales.getLocale(request)); final Map<String, String> langs = langPropsService.getAll(Locales.getLocale(request));
......
...@@ -49,7 +49,7 @@ import java.util.Map; ...@@ -49,7 +49,7 @@ import java.util.Map;
* Page processor. * Page processor.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.8, Dec 3, 2018 * @version 1.1.0.9, Jan 5, 2019
* @since 0.3.1 * @since 0.3.1
*/ */
@RequestProcessor @RequestProcessor
...@@ -97,9 +97,7 @@ public class PageProcessor { ...@@ -97,9 +97,7 @@ public class PageProcessor {
*/ */
@RequestProcessing(value = "/page", method = HttpMethod.GET) @RequestProcessing(value = "/page", method = HttpMethod.GET)
public void showPage(final RequestContext context) { public void showPage(final RequestContext context) {
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "page.ftl");
context.setRenderer(renderer);
renderer.setTemplateName("page.ftl");
final Map<String, Object> dataModel = renderer.getDataModel(); final Map<String, Object> dataModel = renderer.getDataModel();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
......
...@@ -55,7 +55,7 @@ import java.util.Map; ...@@ -55,7 +55,7 @@ import java.util.Map;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a> * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 1.1.1.1, Nov 28, 2018 * @version 1.1.1.2, Jan 5, 2019
* @since 2.4.0 * @since 2.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -128,10 +128,7 @@ public class SearchProcessor { ...@@ -128,10 +128,7 @@ public class SearchProcessor {
@RequestProcessing(value = "/search", method = HttpMethod.GET) @RequestProcessing(value = "/search", method = HttpMethod.GET)
public void search(final RequestContext context) { public void search(final RequestContext context) {
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "search.ftl");
context.setRenderer(renderer);
renderer.setTemplateName("search.ftl");
final Map<String, String> langs = langPropsService.getAll(Latkes.getLocale()); final Map<String, String> langs = langPropsService.getAll(Latkes.getLocale());
final Map<String, Object> dataModel = renderer.getDataModel(); final Map<String, Object> dataModel = renderer.getDataModel();
dataModel.putAll(langs); dataModel.putAll(langs);
......
...@@ -47,7 +47,7 @@ import java.util.Map; ...@@ -47,7 +47,7 @@ import java.util.Map;
* Tag processor. * Tag processor.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.1.7, Dec 3, 2018 * @version 1.1.1.8, Jan 5, 2019
* @since 0.3.1 * @since 0.3.1
*/ */
@RequestProcessor @RequestProcessor
...@@ -107,9 +107,7 @@ public class TagProcessor { ...@@ -107,9 +107,7 @@ public class TagProcessor {
*/ */
@RequestProcessing(value = "/tags/{tagTitle}", method = HttpMethod.GET) @RequestProcessing(value = "/tags/{tagTitle}", method = HttpMethod.GET)
public void showTagArticles(final RequestContext context) { public void showTagArticles(final RequestContext context) {
final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context); final AbstractFreeMarkerRenderer renderer = new SkinRenderer(context, "tag-articles.ftl");
context.setRenderer(renderer);
renderer.setTemplateName("tag-articles.ftl");
final Map<String, Object> dataModel = renderer.getDataModel(); final Map<String, Object> dataModel = renderer.getDataModel();
final HttpServletRequest request = context.getRequest(); final HttpServletRequest request = context.getRequest();
final HttpServletResponse response = context.getResponse(); final HttpServletResponse response = context.getResponse();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment