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

Change journal to journals.

pull/167/head^2
ruibaby 2019-05-15 23:23:49 +08:00 committed by John Niang
parent 2d64b5c329
commit 1a1d3a152d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/run/halo/app/controller/content/ContentJournalController.java
View File

@ -28,7 +28,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
*/ */
@Slf4j @Slf4j
@Controller @Controller
@RequestMapping(value = "/journal") @RequestMapping(value = "/journals")
public class ContentJournalController { public class ContentJournalController {
private final JournalService journalService; private final JournalService journalService;
@ -56,8 +56,8 @@ public class ContentJournalController {
* @return template path: theme/{theme}/journal.ftl * @return template path: theme/{theme}/journal.ftl
*/ */
@GetMapping @GetMapping
public String journal(Model model) { public String journals(Model model) {
return this.journal(model, 1, Sort.by(DESC, "createTime")); return this.journals(model, 1, Sort.by(DESC, "createTime"));
} }
@ -69,7 +69,7 @@ public class ContentJournalController {
* @return template path: theme/{theme}/journal.ftl * @return template path: theme/{theme}/journal.ftl
*/ */
@GetMapping(value = "page/{page}") @GetMapping(value = "page/{page}")
public String journal(Model model, public String journals(Model model,
@PathVariable(value = "page") Integer page, @PathVariable(value = "page") Integer page,
@SortDefault(sort = "createTime", direction = DESC) Sort sort) { @SortDefault(sort = "createTime", direction = DESC) Sort sort) {
log.debug("Requested journal page, sort info: [{}]", sort); log.debug("Requested journal page, sort info: [{}]", sort);
@ -85,6 +85,6 @@ public class ContentJournalController {
model.addAttribute("is_journal", true); model.addAttribute("is_journal", true);
model.addAttribute("journals", journals); model.addAttribute("journals", journals);
model.addAttribute("rainbow", rainbow); model.addAttribute("rainbow", rainbow);
return themeService.render("journal"); return themeService.render("journals");
} }
} }