From 3d32768d717348bb9c75adcf985e886bfc1b5169 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@SPONGRATZ-VOSTRO.aditosoftware.local>
Date: Wed, 21 Oct 2020 10:08:42 +0200
Subject: [PATCH] #1067374-LeadimportAttribute Revert #1066477 und add cases
---
process/Leadimport_lib/process.js | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 6feb9d42a8..ea0f5c14c0 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -448,18 +448,28 @@ LeadImportUtils.insertAttr = function(pDataFields, pDataTypes, pFieldDef, pLeadV
DataValues["OBJECT_TYPE"] = pObjectID;
DataValues["AB_ATTRIBUTE_ID"] = attrdata[1][0];
DataValues["OBJECT_ROWID"] = pContactId;
+
switch(attrdata[1][1].trim())//type
{
- case AttributeTypes.COMBO():
- value = AttributeUtil.getPossibleListValues(attrdata[1][0], attrdata[1][1]).filter(function (attrbute) { return attrbute[1] == value});
-
- type = AttributeTypes.COMBO.databaseField;
- break;
+ case "COMBO":
+ value = newSelect("AB_ATTRIBUTEID")
+ .from("AB_ATTRIBUTE")
+ .whereIfSet("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attrdata[1][0])
+ .and("AB_ATTRIBUTE.ATTRIBUTE_NAME", value)
+ .cell();
+ type = "ID_VALUE";
+ break;
+ case "TEXT":
+ type = "CHAR_VALUE";
+ break;
+ case "BOOLEAN":
+ type = "INT_VALUE";
+ break;
//other cases can be added here
}
if (value.length && type != "")
{
- DataValues[type] = value[0][0];
+ DataValues[type] = value;
LeadImportUtils.insertTable(pDataFields, pDataTypes, DataValues, "AB_ATTRIBUTERELATION", pUser, pDate);
}
}
--
GitLab