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

fix: Content not found exception when empty sheet deleted (#1715)

pull/1724/head
guqing 2022-03-07 17:58:13 +08:00 committed by GitHub
parent 03006e8f35
commit f43fa562d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/run/halo/app/service/assembler/BasePostAssembler.java
View File

@ -179,8 +179,12 @@ public class BasePostAssembler<POST extends BasePost> {
PatchedContent patchedContent = post.getContentOfNullable(); PatchedContent patchedContent = post.getContentOfNullable();
if (patchedContent == null) { if (patchedContent == null) {
Content postContent = contentService.getById(post.getId()); Content postContent = contentService.getByIdOfNullable(post.getId());
if (postContent != null) {
postVo.setSummary(generateSummary(postContent.getContent())); postVo.setSummary(generateSummary(postContent.getContent()));
} else {
postVo.setSummary(StringUtils.EMPTY);
}
} else { } else {
postVo.setSummary(generateSummary(patchedContent.getContent())); postVo.setSummary(generateSummary(patchedContent.getContent()));
} }

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

@ -518,6 +518,7 @@ public class PostServiceImpl extends BasePostServiceImpl<Post> implements PostSe
log.debug("Removed post content: [{}]", postContent); log.debug("Removed post content: [{}]", postContent);
Post deletedPost = super.removeById(postId); Post deletedPost = super.removeById(postId);
deletedPost.setContent(PatchedContent.of(postContent));
// Log it // Log it
eventPublisher.publishEvent(new LogEvent(this, postId.toString(), LogType.POST_DELETED, eventPublisher.publishEvent(new LogEvent(this, postId.toString(), LogType.POST_DELETED,

1
src/main/java/run/halo/app/service/impl/SheetServiceImpl.java
View File

@ -275,6 +275,7 @@ public class SheetServiceImpl extends BasePostServiceImpl<Sheet>
log.debug("Removed sheet content: [{}]", sheetContent); log.debug("Removed sheet content: [{}]", sheetContent);
Sheet sheet = super.removeById(id); Sheet sheet = super.removeById(id);
sheet.setContent(PatchedContent.of(sheetContent));
// Log it // Log it
eventPublisher.publishEvent( eventPublisher.publishEvent(