diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod index 5c483b9f63d00e93dc890594bc436b40fb45f62e..b794f161e46182f88b34adf15eb7670350f3b11a 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 12ee0883e8b9d49b2556cbf740a459580afaf2b3..bfc4a50283b447f3395af80a3ad50b0d4eaabd5f 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);