From 47efb24172a1f81c9cf26fbb98e8242b177125e8 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Nov 2019 14:58:26 +0100
Subject: [PATCH] try to workaround different concat result on maria db
---
.../entityfields/commrestrictions_active/displayValueProcess.js | 2 +-
.../entityfields/commrestrictions_active/displayValueProcess.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js b/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js
index 5ddf69d753..7ab26545fc 100644
--- a/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/commrestrictions_active/displayValueProcess.js
@@ -4,5 +4,5 @@ import("system.result");
if (vars.get("$field.COMMRESTRICTIONS_ACTIVE").trim())
{ // bug in SqlMaskingUtils.concat. -> use " " as seperator and replace " " by ", "
- result.string(translate.text("No advertising by") + " " + vars.get("$field.COMMRESTRICTIONS_ACTIVE").trim().replace(" ", ", "));
+ result.string(translate.text("No advertising by") + " " + ((vars.get("$field.COMMRESTRICTIONS_ACTIVE")).trim()).replace("/ +/g", ", "));
}
diff --git a/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js b/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js
index 5ddf69d753..89026aeebe 100644
--- a/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/commrestrictions_active/displayValueProcess.js
@@ -4,5 +4,5 @@ import("system.result");
if (vars.get("$field.COMMRESTRICTIONS_ACTIVE").trim())
{ // bug in SqlMaskingUtils.concat. -> use " " as seperator and replace " " by ", "
- result.string(translate.text("No advertising by") + " " + vars.get("$field.COMMRESTRICTIONS_ACTIVE").trim().replace(" ", ", "));
+ result.string(translate.text("No advertising by") + " " + ((vars.get("$field.COMMRESTRICTIONS_ACTIVE")).trim()).replace(/ +/g, ", "));
}
--
GitLab