deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

fix naming study chapter during PGN import - closes #4830

pull/4844/head
Thibault Duplessis 2019-01-16 12:43:01 +08:00
parent ec9b0b9098
commit a1d231cc1e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/study/src/main/DataForm.scala
View File

@ -52,6 +52,7 @@ object DataForm {
object importPgn {
lazy val form = Form(mapping(
"name" -> text,
"orientation" -> optional(nonEmptyText),
"variant" -> optional(nonEmptyText),
"mode" -> nonEmptyText.verifying(ChapterMaker.Mode(_).isDefined),
@ -61,6 +62,7 @@ object DataForm {
)(Data.apply)(Data.unapply))
case class Data(
name: String,
orientationStr: Option[String] = None,
variantStr: Option[String] = None,
mode: String,
@ -74,7 +76,8 @@ object DataForm {
def toChapterDatas = MultiPgn.split(pgn, max = 20).value.zipWithIndex map {
case (onePgn, index) =>
ChapterMaker.Data(
name = Chapter.Name(""),
// only the first chapter can be named
name = Chapter.Name((index == 0) ?? name),
variant = variantStr,
pgn = onePgn.some,
orientation = orientation.name,