From 601255a13f7d2ffc5ee7ce99564af38209d4fa43 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sat, 4 Aug 2018 23:23:15 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E9=80=82=E9=85=8DNexT=E4=B8=BB?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../halo/web/controller/front/FrontArchiveController.java | 3 +++ .../halo/web/controller/front/FrontCategoryController.java | 2 ++ .../ryanc/halo/web/controller/front/FrontIndexController.java | 1 + .../ryanc/halo/web/controller/front/FrontPageController.java | 1 + .../cc/ryanc/halo/web/controller/front/FrontTagController.java | 1 + 5 files changed, 8 insertions(+) diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java index 451a91eee..200b742eb 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontArchiveController.java @@ -72,6 +72,7 @@ public class FrontArchiveController extends BaseController { if (null == posts) { return this.renderNotFound(); } + model.addAttribute("is_archives",true); model.addAttribute("posts", posts); return this.render("archives"); } @@ -92,6 +93,7 @@ public class FrontArchiveController extends BaseController { if (null == posts) { return this.renderNotFound(); } + model.addAttribute("is_archives",true); model.addAttribute("posts", posts); return this.render("archives"); } @@ -128,6 +130,7 @@ public class FrontArchiveController extends BaseController { } else { comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatusEnum.RECYCLE.getCode()); } + model.addAttribute("is_post",true); model.addAttribute("post", post); model.addAttribute("comments", CommentUtil.getComments(comments)); model.addAttribute("commentsCount", comments.size()); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java index 5424503e9..4b447659d 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java @@ -45,6 +45,7 @@ public class FrontCategoryController extends BaseController { * @param model model * @return String */ + @GetMapping public String categories(Model model) { List categories = categoryService.findAllCategories(); model.addAttribute("categories", categories); @@ -87,6 +88,7 @@ public class FrontCategoryController extends BaseController { } Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostByCategories(category, pageable); + model.addAttribute("is_categories",true); model.addAttribute("posts", posts); model.addAttribute("category", category); return this.render("category"); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java index dfc1dccbe..08ca96a3c 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java @@ -75,6 +75,7 @@ public class FrontIndexController extends BaseController { if (null == posts) { return this.renderNotFound(); } + model.addAttribute("is_index",true); model.addAttribute("posts", posts); return this.render("index"); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java index ae7c510a2..a0bf81127 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java @@ -83,6 +83,7 @@ public class FrontPageController extends BaseController { } else { comments = commentService.findCommentsByPostAndCommentStatusNot(post, CommentStatusEnum.RECYCLE.getCode()); } + model.addAttribute("is_page",true); model.addAttribute("post", post); model.addAttribute("comments", CommentUtil.getComments(comments)); model.addAttribute("commentsCount", comments.size()); diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java index f9c35efd6..77cdbd272 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontTagController.java @@ -83,6 +83,7 @@ public class FrontTagController extends BaseController { } Pageable pageable = PageRequest.of(page - 1, size, sort); Page posts = postService.findPostsByTags(tag, pageable); + model.addAttribute("is_tags",true); model.addAttribute("posts", posts); model.addAttribute("tag", tag); return this.render("tag");