From 42ba2167e8363a8e277a1806983cf428ad2cd311 Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Wed, 10 Jun 2020 08:14:05 +0000
Subject: [PATCH] #1055236 bugfix leadimport
---
entity/Leadimport_entity/Leadimport_entity.aod | 3 ++-
process/Leadimport_lib/process.js | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 5c483b9f63..b794f161e4 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -242,6 +242,7 @@
<title>Upload new file</title>
<onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/uploadnewfile/onActionProcess.js</onActionProcess>
<iconId>VAADIN:UPLOAD_ALT</iconId>
+ <state>INVISIBLE</state>
</entityActionField>
<entityField>
<name>information</name>
@@ -260,7 +261,7 @@
<onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<iconId>VAADIN:CLOUD_DOWNLOAD</iconId>
- <state>INVISIBLE</state>
+ <state>EDITABLE</state>
</entityActionField>
<entityConsumer>
<name>LeadTempC</name>
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 12ee0883e8..bfc4a50283 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -167,7 +167,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
var persRet;
//------create organisation
- if (LeadValues["NAME"] != "")//only if Organame is filled
+ if (LeadValues["NAME"].trim() != "")//only if Organame is filled
{
orgObjID = "Organisation";//for attribute
orgRet = LeadImportUtils.insertOrg(pDataFields, pDataTypes, pFieldDef, pFieldValues, pUser, pDate);
@@ -183,7 +183,7 @@ LeadImportUtils.importData = function(pDataFields, pDataTypes, pFieldDef, pField
}
}
//------create person
- if (LeadValues[ "LASTNAME" ] != "")//only if lastname is filled
+ if (LeadValues["LASTNAME"].trim() != "")//only if lastname is filled
{
persObjID = "Person";//for attribute
persRet = LeadImportUtils.insertPers(pDataFields, pDataTypes, pFieldDef, pFieldValues, orgid, LeadValues, pUser, pDate);
--
GitLab