composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 18:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3905 - Polishing: CSV Import

Browse Source
This commit is contained in:
acognet
2021-06-18 13:50:27 +02:00
parent e905838733
commit 224031e0d6
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/dbobject.class.php
View File

@@ -790,7 +790,7 @@ abstract class DBObject implements iDisplay
//
/** @var \AttributeExternalField $oAttDef */
$sExtKeyAttCode = $oAttDef->GetKeyAttCode();
if (($iRemote = $this->Get($sExtKeyAttCode)) && ($iRemote > 0)) // Objects in memory have negative IDs
{
$oExtKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
@@ -5547,6 +5547,9 @@ abstract class DBObject implements iDisplay
$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
$aSQLValues = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
$value = reset($aSQLValues);
if ($oAttDef->IsNull($value)) {
$value = '';
}
$aArgs[$sFieldDesc] = $value;
}
return $oExpression->Evaluate($aArgs);