#32 Add user attribute format

TheHive-Project · Nov 20, 2017 · b6c6b5c · b6c6b5c
1 parent e00a051
commit b6c6b5c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/org/elastic4play/models/Attributes.scala b/app/org/elastic4play/models/Attributes.scala
@@ -42,6 +42,7 @@ object AttributeFormat {
   val dateFmt = DateAttributeFormat
   val textFmt = TextAttributeFormat
   val stringFmt = StringAttributeFormat
+  val userFmt = UserAttributeFormat
   val booleanFmt = BooleanAttributeFormat
   val numberFmt = NumberAttributeFormat
   val attachmentFmt = AttachmentAttributeFormat

diff --git a/app/org/elastic4play/models/ModelDef.scala b/app/org/elastic4play/models/ModelDef.scala
@@ -51,9 +51,9 @@ abstract class ModelAttributes(val name: String) extends AttributeDef {
     attr
   }
 
-  val createdBy = attribute("createdBy", AttributeFormat.stringFmt, "user who created this entity", None, AttributeOption.model, AttributeOption.readonly)
+  val createdBy = attribute("createdBy", AttributeFormat.userFmt, "user who created this entity", None, AttributeOption.model, AttributeOption.readonly)
   val createdAt = attribute("createdAt", AttributeFormat.dateFmt, "user who created this entity", new Date, AttributeOption.model, AttributeOption.readonly)
-  val updatedBy = optionalAttribute("updatedBy", AttributeFormat.stringFmt, "user who created this entity", None, AttributeOption.model)
+  val updatedBy = optionalAttribute("updatedBy", AttributeFormat.userFmt, "user who created this entity", None, AttributeOption.model)
   val updatedAt = optionalAttribute("updatedAt", AttributeFormat.dateFmt, "user who created this entity", AttributeOption.model)
 }
 

diff --git a/app/org/elastic4play/models/UserAttributeFormat.scala b/app/org/elastic4play/models/UserAttributeFormat.scala
@@ -0,0 +1,7 @@
+package org.elastic4play.models
+
+class UserAttributeFormat extends StringAttributeFormat {
+  override val name: String = "user"
+}
+
+object UserAttributeFormat extends UserAttributeFormat