diff options
author | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
---|---|---|
committer | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
commit | 19a70318ecee81872fffe23c03d83e725610911d (patch) | |
tree | 984510310c95856fcdcb463d9a242f9773795266 /src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala | |
parent | 05aa114cfd22228f0457b6457ce441af5eabfc60 (diff) | |
parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
download | rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.gz rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.bz2 rest-query-19a70318ecee81872fffe23c03d83e725610911d.zip |
fix merge conflicts with master
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala index d486749..edb0603 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala @@ -1,11 +1,11 @@ package xyz.driver.pdsuidomain.formats.json.label -import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId} +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.{Criterion, CriterionLabel} import play.api.data.validation.ValidationError import play.api.libs.functional.syntax._ import play.api.libs.json._ -import xyz.driver.entities.labels.{Label, LabelCategory} +import xyz.driver.entities.labels.{Label, LabelCategory, LabelValue} /** * @param value Yes|No @@ -34,7 +34,7 @@ object ApiCriterionLabel { labelId = x.labelId.map(_.id), categoryId = x.categoryId.map(_.id), value = x.value.map { x => - FuzzyValue.valueToString(FuzzyValue.fromBoolean(x)) + LabelValue.fromBoolean(x).toString }, isDefining = x.isDefining ) |