From a1d231cc1ed14660e4e989b0033a15cfdfd780d4 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Wed, 16 Jan 2019 12:43:01 +0800 Subject: [PATCH] fix naming study chapter during PGN import - closes #4830 --- modules/study/src/main/DataForm.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/study/src/main/DataForm.scala b/modules/study/src/main/DataForm.scala index 6fe2a86fe2..0bf24d6674 100644 --- a/modules/study/src/main/DataForm.scala +++ b/modules/study/src/main/DataForm.scala @@ -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,