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

fix: unable to access custom sheet. (#1246)

pull/1256/head
Ryan Wang 2021-01-28 00:20:46 +08:00 committed by GitHub
parent be5c60083c
commit 17b847082a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/run/halo/app/controller/content/ContentContentController.java
View File

@ -93,10 +93,6 @@ public class ContentContentController {
public String content(@PathVariable("prefix") String prefix, public String content(@PathVariable("prefix") String prefix,
@RequestParam(value = "token", required = false) String token, @RequestParam(value = "token", required = false) String token,
Model model) { Model model) {
if (optionService.getSheetPermalinkType().equals(SheetPermalinkType.ROOT)) {
Sheet sheet = sheetService.getBySlug(prefix);
return sheetModel.content(sheet, token, model);
}
if (optionService.getArchivesPrefix().equals(prefix)) { if (optionService.getArchivesPrefix().equals(prefix)) {
return postModel.archives(1, model); return postModel.archives(1, model);
} }
@ -115,7 +111,11 @@ public class ContentContentController {
if (optionService.getLinksPrefix().equals(prefix)) { if (optionService.getLinksPrefix().equals(prefix)) {
return linkModel.list(model); return linkModel.list(model);
} }
return null; if (optionService.getSheetPermalinkType().equals(SheetPermalinkType.ROOT)) {
Sheet sheet = sheetService.getBySlug(prefix);
return sheetModel.content(sheet, token, model);
}
throw new NotFoundException("Not Found");
} }
@GetMapping("{prefix}/page/{page:\\d+}") @GetMapping("{prefix}/page/{page:\\d+}")
@ -155,12 +155,6 @@ public class ContentContentController {
} }
} }
if (optionService.getSheetPermalinkType().equals(SheetPermalinkType.SECONDARY)
&& optionService.getSheetPrefix().equals(prefix)) {
Sheet sheet = sheetService.getBySlug(slug);
return sheetModel.content(sheet, token, model);
}
if (optionService.getCategoriesPrefix().equals(prefix)) { if (optionService.getCategoriesPrefix().equals(prefix)) {
return categoryModel.listPost(model, slug, 1); return categoryModel.listPost(model, slug, 1);
} }
@ -175,6 +169,12 @@ public class ContentContentController {
return postModel.content(post, token, model); return postModel.content(post, token, model);
} }
if (optionService.getSheetPermalinkType().equals(SheetPermalinkType.SECONDARY)
&& optionService.getSheetPrefix().equals(prefix)) {
Sheet sheet = sheetService.getBySlug(slug);
return sheetModel.content(sheet, token, model);
}
throw new NotFoundException("Not Found"); throw new NotFoundException("Not Found");
} }