github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix list previous posts bug

pull/146/head
johnniang 2019-04-21 14:45:49 +08:00
parent 36f69cab39
commit 7983ba8fb1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/run/halo/app/service/impl/PostServiceImpl.java
View File

@ -41,6 +41,7 @@ import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.springframework.data.domain.Sort.Direction.ASC;
import static org.springframework.data.domain.Sort.Direction.DESC; import static org.springframework.data.domain.Sort.Direction.DESC;
/** /**
@ -466,7 +467,7 @@ public class PostServiceImpl extends AbstractCrudService<Post, Integer> implemen
return postRepository.findAllByStatusAndCreateTimeAfter(PostStatus.PUBLISHED, return postRepository.findAllByStatusAndCreateTimeAfter(PostStatus.PUBLISHED,
date, date,
PageRequest.of(0, size, Sort.by(DESC, "createTime"))) PageRequest.of(0, size, Sort.by(ASC, "createTime")))
.getContent(); .getContent();
} }

12
src/main/java/run/halo/app/web/controller/content/ContentArchiveController.java
View File

@ -1,5 +1,6 @@
package run.halo.app.web.controller.content; package run.halo.app.web.controller.content;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -22,6 +23,7 @@ import java.util.List;
* @author : RYAN0UP * @author : RYAN0UP
* @date : 2019-03-17 * @date : 2019-03-17
*/ */
@Slf4j
@Controller @Controller
@RequestMapping(value = "archives") @RequestMapping(value = "archives")
public class ContentArchiveController { public class ContentArchiveController {
@ -64,8 +66,14 @@ public class ContentArchiveController {
Model model) { Model model) {
Post post = postService.getBy(PostStatus.PUBLISHED, url); Post post = postService.getBy(PostStatus.PUBLISHED, url);
postService.getNextPost(post.getCreateTime()).ifPresent(nextPost -> model.addAttribute("nextPost", nextPost)); postService.getNextPost(post.getCreateTime()).ifPresent(nextPost -> {
postService.getPrePost(post.getCreateTime()).ifPresent(prePost -> model.addAttribute("prePost", prePost)); log.debug("Next post: [{}]", nextPost);
model.addAttribute("nextPost", nextPost);
});
postService.getPrePost(post.getCreateTime()).ifPresent(prePost -> {
log.debug("Pre post: [{}]", prePost);
model.addAttribute("prePost", prePost);
});
List<Category> categories = postCategoryService.listCategoryBy(post.getId()); List<Category> categories = postCategoryService.listCategoryBy(post.getId());
List<Tag> tags = postTagService.listTagsBy(post.getId()); List<Tag> tags = postTagService.listTagsBy(post.getId());