diff --git a/src/main/scala/app/LabelsController.scala b/src/main/scala/app/LabelsController.scala index 2f9b2b7..2767af9 100644 --- a/src/main/scala/app/LabelsController.scala +++ b/src/main/scala/app/LabelsController.scala @@ -14,13 +14,13 @@ case class LabelForm(labelName: String, color: String) val newForm = mapping( - "newLabelName" -> trim(label("Label name", text(required, maxlength(100)))), - "newColor" -> trim(label("Color", text(required, maxlength(7)))) + "newLabelName" -> trim(label("Label name", text(required, identifier, maxlength(100)))), + "newColor" -> trim(label("Color", text(required, color))) )(LabelForm.apply) val editForm = mapping( - "editLabelName" -> trim(label("Label name", text(required, maxlength(100)))), - "editColor" -> trim(label("Color", text(required, maxlength(7)))) + "editLabelName" -> trim(label("Label name", text(required, identifier, maxlength(100)))), + "editColor" -> trim(label("Color", text(required, color))) )(LabelForm.apply) post("/:owner/:repository/issues/label/new", newForm)(writableRepository { form => diff --git a/src/main/scala/util/Validations.scala b/src/main/scala/util/Validations.scala index 5312e90..a518978 100644 --- a/src/main/scala/util/Validations.scala +++ b/src/main/scala/util/Validations.scala @@ -19,6 +19,8 @@ } } + def color = pattern("#[0-9a-fA-F]{6}") + /** * ValueType for the java.util.Date property. */