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

N°454 - Check data validity during CSV import

Browse Source 
* The controls are only done on database integrity for the different keys.
* If retrofit to branch 2.4 take also the revisions: 4999, 5000, 5005, 5006

SVN:trunk[5022]
This commit is contained in:
Eric Espié
2017-10-13 12:28:09 +00:00
parent d18165ebe9
commit 2f8062d296
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/dbobject.class.php
View File

@@ -1199,17 +1199,24 @@ abstract class DBObject implements iDisplay
}
elseif ($oAtt->IsExternalKey())
{
// Hierachical keys are always tested because an infinite loop can be created.
if (!MetaModel::SkipCheckExtKeys() || $oAtt->IsHierarchicalKey())
if (!MetaModel::SkipCheckExtKeys())
{
// Check allowed values
$sTargetClass = $oAtt->GetTargetClass();
$oTargetObj = MetaModel::GetObject($sTargetClass, $toCheck, false /*must be found*/, true /*allow all data*/);
if (is_null($oTargetObj))
{
return "Target object not found ($sTargetClass::$toCheck)";
}
}
if ($oAtt->IsHierarchicalKey())
{
// This check cannot be deactivated since otherwise the user may break things by a CSV import of a bulk modify
$aValues = $oAtt->GetAllowedValues(array('this' => $this));
if (!array_key_exists($toCheck, $aValues))
{
// TODO Better error message
return "Value not allowed [$toCheck]";
}
}
}
}
elseif ($oAtt->IsScalar())
{
@@ -1261,8 +1268,7 @@ abstract class DBObject implements iDisplay
if ($res !== true)
{
// $res contains the error description
$sAttributeName = Dict::S('Class:'.get_class($this).'/Attribute:'.$sAttCode);
$this->m_aCheckIssues[] = "Unexpected value for attribute '$sAttributeName': $res";
$this->m_aCheckIssues[] = "Unexpected value for attribute '$sAttCode': $res";
}
}
if (count($this->m_aCheckIssues) > 0)
@@ -1675,8 +1681,7 @@ abstract class DBObject implements iDisplay
if (!$bRes)
{
$sIssues = implode(', ', $aIssues);
$sClassName = Dict::S('Class:'.get_class($this));
throw new CoreException("Object not following integrity rules", array('<br>issues' => $sIssues, '<br>class' => $sClassName, '<br>id' => $this->GetKey()));
throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
}
// Stop watches
@@ -1941,8 +1946,7 @@ abstract class DBObject implements iDisplay
if (!$bRes)
{
$sIssues = implode(', ', $aIssues);
$sClassName = Dict::S('Class:'.get_class($this));
throw new CoreException("Object not following integrity rules", array('<br>issues' => $sIssues, '<br>class' => $sClassName, '<br>id' => $this->GetKey()));
throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
}
// Save the original values (will be reset to the new values when the object get written to the DB)