From 8176451e5a09b7a674986287aacd506a90498eb5 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Sat, 8 Jun 2019 19:55:59 +0800
Subject: [PATCH] Fixed Controller model.

---
 .../app/controller/content/ContentCategoryController.java    | 5 +++--
 .../halo/app/controller/content/ContentSheetController.java  | 1 -
 .../halo/app/controller/content/ContentTagController.java    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/run/halo/app/controller/content/ContentCategoryController.java b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java
index a922db198..da9b57085 100644
--- a/src/main/java/run/halo/app/controller/content/ContentCategoryController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java
@@ -52,7 +52,8 @@ public class ContentCategoryController {
      * @return template path: themes/{theme}/categories.ftl
      */
     @GetMapping
-    public String categories() {
+    public String categories(Model model) {
+        model.addAttribute("is_categories", true);
         return themeService.render("categories");
     }
 
@@ -89,7 +90,7 @@ public class ContentCategoryController {
         Page<Post> posts = postCategoryService.pagePostBy(category.getId(), pageable);
         final int[] rainbow = PageUtil.rainbow(page, posts.getTotalPages(), 3);
 
-        model.addAttribute("is_categories", true);
+        model.addAttribute("is_category", true);
         model.addAttribute("posts", posts);
         model.addAttribute("rainbow", rainbow);
         model.addAttribute("category", category);
diff --git a/src/main/java/run/halo/app/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java
index b7174fca2..7a2e4693d 100644
--- a/src/main/java/run/halo/app/controller/content/ContentSheetController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java
@@ -60,7 +60,6 @@ public class ContentSheetController {
      */
     @GetMapping(value = "/s/{url}")
     public String sheet(@PathVariable(value = "url") String url,
-                        @RequestParam(value = "cp", defaultValue = "1") Integer cp,
                         Model model) {
         Sheet sheet = sheetService.getBy(PostStatus.PUBLISHED, url);
 
diff --git a/src/main/java/run/halo/app/controller/content/ContentTagController.java b/src/main/java/run/halo/app/controller/content/ContentTagController.java
index 40fa985fb..f68b5eef5 100644
--- a/src/main/java/run/halo/app/controller/content/ContentTagController.java
+++ b/src/main/java/run/halo/app/controller/content/ContentTagController.java
@@ -56,7 +56,8 @@ public class ContentTagController {
      * @return template path: themes/{theme}/tags.ftl
      */
     @GetMapping
-    public String tags() {
+    public String tags(Model model) {
+        model.addAttribute("is_tags", true);
         return themeService.render("tags");
     }
 
@@ -93,7 +94,7 @@ public class ContentTagController {
         Page<PostListVO> posts = postService.convertToListVo(postPage);
         final int[] rainbow = PageUtil.rainbow(page, posts.getTotalPages(), 3);
 
-        model.addAttribute("is_tags", true);
+        model.addAttribute("is_tag", true);
         model.addAttribute("posts", posts);
         model.addAttribute("rainbow", rainbow);
         model.addAttribute("tag", tag);