TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow empty custom field values

Browse Source
This commit is contained in:
Eike Kettner 2020-11-23 10:38:59 +01:00
parent f8c6d183ed
commit 7712e02d2d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/common/src/main/scala/docspell/common/CustomFieldType.scala
View File

@ -28,7 +28,10 @@ object CustomFieldType {
value value
def parseValue(value: String): Either[String, String] = def parseValue(value: String): Either[String, String] =
Right(value) Option(value)
.map(_.trim)
.filter(_.nonEmpty)
.toRight("Empty values are not allowed.")
} }
case object Numeric extends CustomFieldType { case object Numeric extends CustomFieldType {
@ -62,7 +65,11 @@ object CustomFieldType {
value.toString value.toString
def parseValue(value: String): Either[String, Boolean] = def parseValue(value: String): Either[String, Boolean] =
Right(value.equalsIgnoreCase("true")) Option(value)
.map(_.trim)
.filter(_.nonEmpty)
.toRight("Empty values not allowed")
.map(_.equalsIgnoreCase("true"))
} }