From 7319421d88c9ba01f8757bdec2bdc6402678ec8e Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Tue, 8 Dec 2020 07:35:33 +0000
Subject: [PATCH] Bugfix leadimport
---
.../Data_alias/basic/2020.2.2/alter_TableLeadStatus.xml | 6 ++++++
.liquibase/Data_alias/basic/2020.2.2/changelog.xml | 1 +
.../recordcontainers/dbrecordcontainer/onDBUpdate.js | 4 +++-
process/Leadimport_lib/process.js | 1 +
4 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 .liquibase/Data_alias/basic/2020.2.2/alter_TableLeadStatus.xml
diff --git a/.liquibase/Data_alias/basic/2020.2.2/alter_TableLeadStatus.xml b/.liquibase/Data_alias/basic/2020.2.2/alter_TableLeadStatus.xml
new file mode 100644
index 00000000000..9f11810890c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.2/alter_TableLeadStatus.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.nowack" id="bcd6cb02-d074-444f-a307-34973b3dd4dn">
+ <modifyDataType tableName="LEAD" columnName="STATUS" newDataType="VARCHAR(36)"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.2/changelog.xml b/.liquibase/Data_alias/basic/2020.2.2/changelog.xml
index f1519ab694e..302d930f6b0 100644
--- a/.liquibase/Data_alias/basic/2020.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.2.2/changelog.xml
@@ -5,6 +5,7 @@
<include relativeToChangelogFile="true" file="Knowledgemanagement/changelog_knowledgeManagement.xml"/>
<include relativeToChangelogFile="true" file="insert_employeeCountAttribute.xml"/>
<include relativeToChangelogFile="true" file="alter_CampaignParticipantResponsible.xml"/>
+ <include relativeToChangelogFile="true" file="alter_TableLeadStatus.xml"/>
<include relativeToChangelogFile="true" file="MSTeams/changelog.xml"/>
<include relativeToChangelogFile="true" file="insert_newsletterAttribute.xml"/>
<include relativeToChangelogFile="true" file="readd_ExporttemplateIndizes.xml"/>
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
index c8e53ac00d7..c752ef5850f 100644
--- a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("system.vars");
var rowdata = vars.get("$local.rowdata");
@@ -6,5 +7,6 @@ let scanPattern = JSON.parse(rowdata["DUPLICATESCANNER.SCAN_PATTERN"]);
if (scanPattern.provider == undefined)
{
scanPattern.provider = "indexP";
- vars.set("$field.SCAN_PATTERN", JSON.stringify(scanPattern));
+ newWhere("DUPLICATESCANNER.ID", vars.get("$local.uid"))
+ .updateData(true, "DUPLICATESCANNER", ["DUPLICATESCANNER.SCAN_PATTERN"], null,[JSON.stringify(scanPattern)]);
}
\ No newline at end of file
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index de9d13b2c7b..6e902b7f0a5 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -349,6 +349,7 @@ LeadImportUtils.setValues = function(pFields, pFieldDef, pFieldValues)
* @return {String} outputvalue
*/
LeadImportUtils.getMappedOutputvalue = function (pField, pInputValue) {
+ pInputValue = pInputValue.replace("/ß/gi", "ss");
if (LeadImportUtils.mapping != undefined &&
LeadImportUtils.mapping[pField] != undefined &&
LeadImportUtils.mapping[pField][pInputValue] != undefined)
--
GitLab