Merge branch 'release/v0.9.0b24'

nulab · Feb 19, 2016 · be158b4 · be158b4
2 parents 3b7cc93 + a3e354b
commit be158b4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ Migrate your projects from Redmine to [Backlog].
 * The Backlog Space's administrator roles. 
 
 ## Update
+* 2016/02/19 0.9.0b24 released
 * 2016/02/18 0.9.0b23 released
 * 2016/02/17 0.9.0b22 released
 * 2016/02/15 0.9.0b21 released
@@ -260,6 +261,7 @@ Redmineのプロジェクトを[Backlog]に移行するためのツールです
 * Backlogの管理者権限
 
 ## 更新履歴
+* 2016/02/19 0.9.0b24 リリース
 * 2016/02/18 0.9.0b23 リリース
 * 2016/02/17 0.9.0b22 リリース
 * 2016/02/15 0.9.0b21 リリース
@@ -492,4 +494,4 @@ https://www.backlog.jp/contact/
 
 [Backlog]: http://www.backlog.jp/
 
-[Jar]: https://github.com/nulab/BacklogMigration-Redmine/releases/download/v0.9.0b23/backlog-migration-redmine-0.9.0b23.jar
+[Jar]: https://github.com/nulab/BacklogMigration-Redmine/releases/download/v0.9.0b24/backlog-migration-redmine-0.9.0b24.jar
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ name := "backlog-migration-redmine"
 
 organization := "com.nulabinc"
 
-version := "0.9.0b23"
+version := "0.9.0b24"
 
 scalaVersion := "2.11.6"
 

diff --git a/src/main/scala/com/nulabinc/r2b/conf/ConfigBase.scala b/src/main/scala/com/nulabinc/r2b/conf/ConfigBase.scala
@@ -8,7 +8,7 @@ import java.io.File
 object ConfigBase {
   val LOG_APPLICATION_LABEL = "[R2B]"
   val NAME: String = "Backlog Migration for Redmine"
-  val VERSION: String = "0.9.0b23"
+  val VERSION: String = "0.9.0b24"
 
   val root = new File(".").getAbsoluteFile.getParent
   val R2B_ROOT = root + "/backlog-migration-redmine"

diff --git a/src/main/scala/com/nulabinc/r2b/domain/Redmine.scala b/src/main/scala/com/nulabinc/r2b/domain/Redmine.scala
@@ -127,10 +127,7 @@ case class RedmineCustomFieldDefinition(
                                          minLength: Option[Int],
                                          maxLength: Option[Int],
                                          isRequired: Boolean,
-                                         isFilter: Boolean,
-                                         isSearchable: Boolean,
                                          isMultiple: Boolean,
-                                         isVisible: Boolean,
                                          defaultValue: Option[String],
                                          trackers: Seq[RedmineTracker],
                                          possibleValues: Seq[String])
@@ -147,7 +144,6 @@ case class OldCustomFieldDefinition(
                                      regexp: Option[String],
                                      min_length: Option[Int],
                                      max_length: Option[Int],
-                                     visible: Boolean,
                                      default_value: Option[String],
                                      trackers: OldTrackers,
                                      possible_values: Option[Seq[OldPossibleValues]])
@@ -178,7 +174,7 @@ object RedmineJsonProtocol extends DefaultJsonProtocol {
   implicit val RedminePrioritiesWrapperFormat = jsonFormat1(RedminePrioritiesWrapper)
   implicit val RedmineIssueCategoryFormat = jsonFormat2(RedmineIssueCategory)
   implicit val RedmineIssueCategoriesWrapperFormat = jsonFormat1(RedmineIssueCategoriesWrapper)
-  implicit val RedmineCustomFieldDefinitionFormat = jsonFormat15(RedmineCustomFieldDefinition)
+  implicit val RedmineCustomFieldDefinitionFormat = jsonFormat12(RedmineCustomFieldDefinition)
   implicit val RedmineCustomFieldDefinitionsWrapperFormat = jsonFormat1(RedmineCustomFieldDefinitionsWrapper)
   implicit val RedmineNewsFormat = jsonFormat6(RedmineNews)
   implicit val RedmineNewsWrapperFormat = jsonFormat1(RedmineNewsWrapper)
@@ -187,6 +183,6 @@ object RedmineJsonProtocol extends DefaultJsonProtocol {
   implicit val RedmineIssuesWrapperFormat = jsonFormat3(RedmineIssuesWrapper)
   implicit val OldPossibleValuesFormat = jsonFormat1(OldPossibleValues)
   implicit val OldTrackersFormat = jsonFormat1(OldTrackers)
-  implicit val OldCustomFieldDefinitionFormat = jsonFormat11(OldCustomFieldDefinition)
+  implicit val OldCustomFieldDefinitionFormat = jsonFormat10(OldCustomFieldDefinition)
   implicit val OldCustomFieldDefinitionsWrapperFormat = jsonFormat1(OldCustomFieldDefinitionsWrapper)
 }
diff --git a/src/main/scala/com/nulabinc/r2b/service/CustomFieldConverter.scala b/src/main/scala/com/nulabinc/r2b/service/CustomFieldConverter.scala
@@ -44,10 +44,7 @@ class CustomFieldConverter(conf: R2BConfig) extends R2BLogging {
       minLength = Option(cfd.getMinLength).map(_.toInt),
       maxLength = Option(cfd.getMaxLength).map(_.toInt),
       isRequired = cfd.isRequired,
-      isFilter = cfd.isFilter,
-      isSearchable = cfd.isSearchable,
       isMultiple = cfd.isMultiple,
-      isVisible = cfd.isVisible,
       defaultValue = if (cfd.getDefaultValue == null || cfd.getDefaultValue.isEmpty) None else Some(cfd.getDefaultValue),
       trackers = cfd.getTrackers.asScala.map(getRedmineTracker),
       possibleValues = if (cfd.getPossibleValues == null) Seq.empty[String] else cfd.getPossibleValues.asScala)
@@ -62,10 +59,7 @@ class CustomFieldConverter(conf: R2BConfig) extends R2BLogging {
       minLength = ocfd.min_length,
       maxLength = ocfd.max_length,
       isRequired = false,
-      isFilter = false,
-      isSearchable = false,
       isMultiple = false,
-      isVisible = ocfd.visible,
       defaultValue = ocfd.default_value,
       trackers = redmineService.getTrackers.map(getRedmineTracker),
       possibleValues = convertPossibleValues(ocfd.possible_values))