All fields have a label

softwaremill · Mar 16, 2015 · 49fb1bf · 49fb1bf
1 parent 029b629
commit 49fb1bf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/supler/src/main/scala/org/supler/field/ActionField.scala b/supler/src/main/scala/org/supler/field/ActionField.scala
@@ -31,7 +31,6 @@ case class ActionField[T](
     val validationScopeJSON = JObject(JField("name", JString(validationScopeJSONData.name)) :: validationScopeJSONData.extra)
 
     JObject(List(
-      JField(Label, JString(label.getOrElse(""))),
       JField(Type, JString(SpecialFieldTypes.Action)),
       JField(Path, JString(parentPath.append(name).toString)),
       JField("validation_scope", validationScopeJSON)

diff --git a/supler/src/main/scala/org/supler/field/Field.scala b/supler/src/main/scala/org/supler/field/Field.scala
@@ -7,6 +7,7 @@ import org.supler.{FieldPath, MultiFieldRow, Row, RowsJSON}
 
 trait Field[T] extends Row[T] {
   def name: String
+  def label: Option[String]
 
   private[supler] def enabledIf: T => Boolean
   private[supler] def includeIf: T => Boolean
@@ -22,6 +23,7 @@ trait Field[T] extends Row[T] {
       val fieldJson = JObject(
         JField(JSONFieldNames.Name, JString(name)) ::
           JField(JSONFieldNames.Enabled, JBool(isEnabled)) ::
+          JField(JSONFieldNames.Label, JString(label.getOrElse(""))) ::
           fieldJsonPartial.obj)
 
       RowsJSON.singleField(fieldJson, name)

diff --git a/supler/src/main/scala/org/supler/field/GenerateBasicJSON.scala b/supler/src/main/scala/org/supler/field/GenerateBasicJSON.scala
@@ -7,7 +7,6 @@ import org.supler._
 trait GenerateBasicJSON[T] {
   this: Field[T] =>
 
-  def label: Option[String]
   def renderHint: Option[RenderHint]
 
   private[supler] override def generateFieldJSON(parentPath: FieldPath, obj: T) = {
@@ -16,7 +15,6 @@ trait GenerateBasicJSON[T] {
     import JSONFieldNames._
 
     JObject(List(
-      JField(Label, JString(label.getOrElse(""))),
       JField(Type, JString(data.fieldTypeName)),
       JField(Validate, JObject(data.validationJSON.toList)),
       JField(Path, JString(parentPath.append(name).toString))

diff --git a/supler/src/main/scala/org/supler/field/SubformField.scala b/supler/src/main/scala/org/supler/field/SubformField.scala
@@ -10,7 +10,7 @@ case class SubformField[T, ContU, U, Cont[_]](
   name: String,
   read: T => Cont[U],
   write: (T, Cont[U]) => T,
-  _label: Option[String],
+  label: Option[String],
   embeddedForm: Form[U],
   // if not specified, `embeddedForm.createEmpty` will be used
   createEmpty: Option[() => U],
@@ -20,7 +20,7 @@ case class SubformField[T, ContU, U, Cont[_]](
 
   import c._
 
-  def label(newLabel: String): SubformField[T, ContU, U, Cont] = this.copy(_label = Some(newLabel))
+  def label(newLabel: String): SubformField[T, ContU, U, Cont] = this.copy(label = Some(newLabel))
 
   def renderHint(newRenderHint: RenderHint with SubformFieldCompatible): SubformField[T, ContU, U, Cont] = this.copy(renderHint = newRenderHint)
 
@@ -37,7 +37,7 @@ case class SubformField[T, ContU, U, Cont[_]](
       JField(Type, JString(SpecialFieldTypes.Subform)),
       JField(RenderHint, JObject(JField("name", JString(renderHint.name)) :: renderHint.extraJSON)),
       JField(Multiple, JBool(c.isMultiple)),
-      JField(Label, JString(_label.getOrElse(""))),
+      JField(Label, JString(label.getOrElse(""))),
       JField(Path, JString(parentPath.append(name).toString)),
       JField(Value, c.combineJValues(valuesAsJValue))
     )