Skip to content

Commit b0322c9

Browse files
committed
#234 Check case template consitency
1 parent 7e72466 commit b0322c9

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

thehive-backend/app/models/Audit.scala

+1-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AuditModel(
4949
case (ObjectAttributeFormat(subAttributes1), ObjectAttributeFormat(subAttributes2)) mergeAttributes(context, subAttributes1 ++ subAttributes2)
5050
case (f1, f2) if f1 == f2 Some(f1)
5151
case (f1, f2)
52-
logger.warn(s"$f1 != $f2")
52+
logger.warn(s"Attribute $f1 != $f2")
5353
None
5454

5555
}
@@ -92,10 +92,6 @@ class AuditModel(
9292
.getOrElse(Nil)
9393
}
9494

95-
logger.info("Audit attributes:")
96-
detailsAttributes.foreach { a
97-
logger.info(s"\t${a.name}: ${a.format}")
98-
}
9995
override def apply(attributes: JsObject): Audit = new Audit(this, attributes)
10096
}
10197

thehive-backend/app/models/CaseTemplate.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ trait CaseTemplateAttributes { _: AttributeDef ⇒
2828

2929
@Singleton
3030
class CaseTemplateModel @Inject() (taskModel: TaskModel) extends ModelDef[CaseTemplateModel, CaseTemplate]("caseTemplate") with CaseTemplateAttributes {
31-
def taskAttributes: Seq[Attribute[_]] = taskModel.attributes
31+
def taskAttributes: Seq[Attribute[_]] = taskModel
32+
.attributes
33+
.filter(_.isForm)
3234
}
3335
class CaseTemplate(model: CaseTemplateModel, attributes: JsObject) extends EntityDef[CaseTemplateModel, CaseTemplate](model, attributes) with CaseTemplateAttributes {
3436
def taskAttributes = Nil

0 commit comments

Comments
 (0)