From 8282e5d1edd2207166e0d68f19818f74d5ba82c3 Mon Sep 17 00:00:00 2001 From: To-om Date: Mon, 6 Dec 2021 13:59:22 +0100 Subject: [PATCH] #2278 Add space between title prefix and title --- 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 a6d31a9124..3d919fc09c 100644 --- a/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala +++ b/thehive/app/org/thp/thehive/controllers/v0/Conversion.scala @@ -187,7 +187,7 @@ object Conversion { def withCaseTemplate(caseTemplate: RichCaseTemplate): InputCase = InputCase( - title = caseTemplate.titlePrefix.getOrElse("") + inputCase.title, + title = caseTemplate.titlePrefix.fold("")(_.replaceAll("(?m)\\s*$", " ")) + inputCase.title, description = inputCase.description, severity = inputCase.severity orElse caseTemplate.severity, startDate = inputCase.startDate, diff --git a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala index 99d70f90d7..7ed5da52f9 100644 --- a/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala +++ b/thehive/app/org/thp/thehive/controllers/v1/Conversion.scala @@ -133,7 +133,7 @@ object Conversion { def withCaseTemplate(caseTemplate: RichCaseTemplate): InputCase = InputCase( - title = caseTemplate.titlePrefix.getOrElse("") + inputCase.title, + title = caseTemplate.titlePrefix.fold("")(_.replaceAll("(?m)\\s*$", " ")) + inputCase.title, description = inputCase.description, severity = inputCase.severity orElse caseTemplate.severity, startDate = inputCase.startDate,