From ac8d6e2ef4e60f64f5765b7ef760cfe63e887350 Mon Sep 17 00:00:00 2001 From: chivehao Date: Wed, 14 Aug 2024 22:10:41 +0800 Subject: [PATCH 1/2] fix: theme subject details --- .../java/run/ikaros/server/controller/SubjectController.java | 2 +- server/src/main/resources/templates/simple | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/run/ikaros/server/controller/SubjectController.java b/server/src/main/java/run/ikaros/server/controller/SubjectController.java index 925c66c10..29af3c607 100644 --- a/server/src/main/java/run/ikaros/server/controller/SubjectController.java +++ b/server/src/main/java/run/ikaros/server/controller/SubjectController.java @@ -65,7 +65,7 @@ public Mono index(Model model, Integer page, Integer size, SubjectType t */ @GetMapping("/{id}") public Mono findById(@PathVariable("id") Long id, - @RequestParam("episode") Integer epSeq, Model model) { + @RequestParam("episode") Float epSeq, Model model) { return subjectService.findById(id) .flatMap(subject -> addEpisodesResourcesAttachmentIdSubtitleMap2Model(subject, model)) .map(subject -> model.addAttribute("subject", subject)) diff --git a/server/src/main/resources/templates/simple b/server/src/main/resources/templates/simple index a48c3ce3b..0cc33839f 160000 --- a/server/src/main/resources/templates/simple +++ b/server/src/main/resources/templates/simple @@ -1 +1 @@ -Subproject commit a48c3ce3b9b9be30f54165e37d0201141edb12b2 +Subproject commit 0cc33839f19f36b9a521b15f2fc988382e044b6e From 3920570ba9e3846bad2d09a65826606b92bcaf87 Mon Sep 17 00:00:00 2001 From: chivehao Date: Wed, 14 Aug 2024 22:12:14 +0800 Subject: [PATCH 2/2] docs: update CHANGELOG.MD --- CHANGELOG.MD | 6 ++++++ gradle.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index f34233f78..4d6ec45ef 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -2,6 +2,12 @@ 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。 +# 0.15.4 + +## 主题 + +- 修复默认主题剧集序号选择问题 + # 0.15.3 ## 问题修复 diff --git a/gradle.properties b/gradle.properties index 907aa7a49..69b2c63b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.15.3 +version=0.15.4