From 6db5c95f6e7f83dd17b80a912786b80d246b9191 Mon Sep 17 00:00:00 2001 From: To-om Date: Sat, 16 May 2020 09:19:03 +0200 Subject: [PATCH] #1338 Case creation: use severity from case template only if user doesn't override it --- thehive/app/org/thp/thehive/controllers/v0/Conversion.scala | 2 +- thehive/app/org/thp/thehive/controllers/v1/Conversion.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala b/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala index 61604873b2..dca9c471f1 100644 --- a/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala +++ b/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala @@ -166,7 +166,7 @@ object Conversion { InputCase( title = caseTemplate.titlePrefix.getOrElse("") + inputCase.title, description = inputCase.description, - severity = caseTemplate.severity orElse inputCase.severity, + severity = inputCase.severity orElse caseTemplate.severity, startDate = inputCase.startDate, endDate = inputCase.endDate, tags = inputCase.tags, diff --git a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala index 6282e36240..f003e91233 100644 --- a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala +++ b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala @@ -90,7 +90,7 @@ object Conversion { InputCase( title = caseTemplate.titlePrefix.getOrElse("") + inputCase.title, description = inputCase.description, - severity = caseTemplate.severity orElse inputCase.severity, + severity = inputCase.severity orElse caseTemplate.severity, startDate = inputCase.startDate, endDate = inputCase.endDate, tags = inputCase.tags,