From 595be8f6570c02eb76b12682a1657ac188d86d58 Mon Sep 17 00:00:00 2001 From: "s.pongratz" <s.pongratz@adito.de> Date: Mon, 13 Jul 2020 11:19:46 +0200 Subject: [PATCH] #1060627-LeadimportMappingassistent Anpassungen am Datentyp --- .../create_leadimportMappingAssistant.xml | 2 +- aliasDefinition/Data_alias/Data_alias.aod | 4 ++-- process/Leadimport_lib/process.js | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml index 2a94138e9a..a9e22a51b9 100644 --- a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml +++ b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml @@ -14,7 +14,7 @@ <column name="USER_EDIT" type="NVARCHAR(50)" /> <column name="DATE_EDIT" type="DATETIME"/> - <column name="FIELDNAME" type="CHAR(36)"/> + <column name="FIELDNAME" type="VARCHAR(100)"/> <column name="INPUTVALUE" type="VARCHAR(300)"/> <column name="OUTPUTVALUE" type="VARCHAR(300)"/> <column name="LEADIMPORT_ID" type="CHAR(36)"/> diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 5c9cc32cb1..ae4162ae31 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -14997,8 +14997,8 @@ <name>FIELDNAME</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="12" /> + <size v="100" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js index c64553038d..6b5411de5e 100644 --- a/process/Leadimport_lib/process.js +++ b/process/Leadimport_lib/process.js @@ -228,8 +228,7 @@ LeadImportUtils.getMapping = function(pleadimportId) newSelect(["LEADIMPORTMAPPINGASSISTANT.FIELDNAME", "LEADIMPORTMAPPINGASSISTANT.INPUTVALUE", "LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE"]) .from("LEADIMPORTMAPPINGASSISTANT") .where("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", pleadimportId) - .table().forEach(function (d) { - d[0] = d[0].trim(); + .table().forEach(function (d) { if (tempData[d[0]] == undefined ) tempData[d[0]] = {} //[[d[1], d[2]]] tempData[d[0]][d[1]] = d[2]; -- GitLab