#1625 Fix case link with ignoreSimilarity

TheHive-Project · Nov 9, 2020 · 8d5e145 · 8d5e145
1 parent 85908d4
commit 8d5e145
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/thehive/app/org/thp/thehive/services/CaseSrv.scala b/thehive/app/org/thp/thehive/services/CaseSrv.scala
@@ -79,9 +79,10 @@ class CaseSrv @Inject() (
       }
       _ <- createdTasks.toTry(t => shareSrv.shareTask(t, createdCase, organisation))
 
-      caseTemplateCf = caseTemplate
-        .fold[Seq[RichCustomField]](Seq())(_.customFields)
-        .map(cf => InputCustomFieldValue(cf.name, cf.value, cf.order))
+      caseTemplateCf =
+        caseTemplate
+          .fold[Seq[RichCustomField]](Seq())(_.customFields)
+          .map(cf => InputCustomFieldValue(cf.name, cf.value, cf.order))
       cfs <- cleanCustomFields(caseTemplateCf, customFields).toTry {
         case InputCustomFieldValue(name, value, order) => createCustomField(createdCase, EntityIdOrName(name), value, order)
       }
@@ -470,9 +471,11 @@ object CaseOps {
       traversal
         .as(originCaseLabel)
         .observables
+        .hasNot(_.ignoreSimilarity, true)
         .as(observableLabel)
         .data
         .observables
+        .hasNot(_.ignoreSimilarity, true)
         .shares
         .filter(_.organisation.current)
         .`case`