redtea/EasyStartup
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Viktoria committed 2022-08-29 15:24:28 +02:00
2 parents 39aad68575 bad1108f94
commit 0395ab2195
3 files changed
+32 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/site/easystartup/web/forum/controller/ForumController.java
+3 -5
View File
@@ -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";
}
}