diff --git a/src/main/java/site/easystartup/web/forum/controller/ForumController.java b/src/main/java/site/easystartup/web/forum/controller/ForumController.java index 7350e4e..e9f9eb1 100644 --- a/src/main/java/site/easystartup/web/forum/controller/ForumController.java +++ b/src/main/java/site/easystartup/web/forum/controller/ForumController.java @@ -64,7 +64,7 @@ public class ForumController { Model model) { val pinned_discussions = forumFilterService.getPinnedDiscussionsByTopicId(topic_id); model.addAttribute("pinned_discussions", pinned_discussions); - val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList(0, 15); + val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList(0, 14); model.addAttribute("discussions", discussions); return "topic-first"; } @@ -73,10 +73,8 @@ public class ForumController { public String topicPage(@PathVariable(value = "topic_id") long topic_id, @PathVariable(value = "topic_id") long page_index, Model model) { - val pinned_discussions = forumFilterService.getPinnedDiscussionsByTopicId(topic_id); - model.addAttribute("pinned_discussions", pinned_discussions); - val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList(0, 15); + val discussions = forumFilterService.getSortedDiscussionsByTopicId(topic_id).subList((int)(15 * page_index), (int)(15 * page_index) + 15); model.addAttribute("discussions", discussions); - return "topic-first"; + return "topic-content"; } } diff --git a/src/main/resources/templates/topic-content.html b/src/main/resources/templates/topic-content.html new file mode 100644 index 0000000..f6672af --- /dev/null +++ b/src/main/resources/templates/topic-content.html @@ -0,0 +1,28 @@ + + + + + + + + + + + +
+

Сообщения

+
+

+

+

+

+

+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/topic-first.html b/src/main/resources/templates/topic-first.html index 8f31a26..b6512cb 100644 --- a/src/main/resources/templates/topic-first.html +++ b/src/main/resources/templates/topic-first.html @@ -4,7 +4,7 @@ xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity3"> - Вход + Обсуждение