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

Fixed sheet render error.

pull/146/head
ruibaby 2019-04-30 11:49:28 +08:00
parent 297dafc34f
commit 03b7c33297
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/run/halo/app/controller/content/ContentSheetController.java
View File

@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import run.halo.app.model.entity.Sheet; import run.halo.app.model.entity.Sheet;
import run.halo.app.model.enums.PostStatus; import run.halo.app.model.enums.PostStatus;
import run.halo.app.model.support.HaloConst;
import run.halo.app.service.SheetService; import run.halo.app.service.SheetService;
import run.halo.app.service.ThemeService; import run.halo.app.service.ThemeService;
@ -65,8 +66,10 @@ public class ContentSheetController {
model.addAttribute("sheet", sheetService.convertToDetail(sheet)); model.addAttribute("sheet", sheetService.convertToDetail(sheet));
if (StrUtil.isNotEmpty(sheet.getTemplate())) { if (StrUtil.isNotEmpty(sheet.getTemplate())) {
if (themeService.isTemplateExist(sheet.getTemplate() + HaloConst.SUFFIX_FTL)) {
return themeService.render(sheet.getTemplate()); return themeService.render(sheet.getTemplate());
} }
}
return themeService.render("sheet"); return themeService.render("sheet");
} }
} }