composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +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

29
core/bulkchange.class.inc.php
View File

@@ -109,11 +109,11 @@ class CellStatus_Modify extends CellChangeSpec
class CellStatus_Issue extends CellStatus_Modify
{
protected $m_sDictEntry;
protected $m_sReason;
public function __construct($proposedValue, $previousValue, $sReason)
{
$this->m_sDictEntry = $sReason;
$this->m_sReason = $sReason;
parent::__construct($proposedValue, $previousValue);
}
@@ -121,9 +121,9 @@ class CellStatus_Issue extends CellStatus_Modify
{
if (is_null($this->m_proposedValue))
{
return Dict::Format('UI:CSVReport-Value-SetIssue', $this->m_sDictEntry);
return Dict::Format('UI:CSVReport-Value-SetIssue', $this->m_sReason);
}
return Dict::Format('UI:CSVReport-Value-ChangeIssue', $this->m_proposedValue, $this->m_sDictEntry);
return Dict::Format('UI:CSVReport-Value-ChangeIssue', $this->m_proposedValue, $this->m_sReason);
}
}
@@ -366,8 +366,6 @@ class BulkChange
}
else
{
// Check for additional rules
//$oReconFilter = $oExtKey->GetAllowedValuesAsFilter(array('this' => $oTargetObj));
$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
$aCacheKeys = array();
@@ -407,7 +405,7 @@ class BulkChange
else
{
// Cache miss, let's initialize it
$oExtObjects = new CMDBObjectSet($oReconFilter, array(), array('this' => $oTargetObj));
$oExtObjects = new CMDBObjectSet($oReconFilter);
$iCount = $oExtObjects->Count();
if ($iCount == 1)
{
@@ -478,7 +476,6 @@ class BulkChange
// skip reconciliation keys
if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ continue; }
$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
$aReasons = array();
$iFlags = $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) )
@@ -535,13 +532,11 @@ class BulkChange
{
$sCurValue = $oTargetObj->GetAsHTML($sAttCode, $this->m_bLocalizedValues);
$sOrigValue = $oTargetObj->GetOriginalAsHTML($sAttCode, $this->m_bLocalizedValues);
//$sInput = htmlentities($aRowData[$iCol], ENT_QUOTES, 'UTF-8');
}
else
{
$sCurValue = $oTargetObj->GetAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
$sOrigValue = $oTargetObj->GetOriginalAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
//$sInput = $aRowData[$iCol];
}
if (isset($aErrors[$sAttCode]))
{
@@ -650,7 +645,6 @@ class BulkChange
{
$oTargetObj = MetaModel::NewObject($this->m_sClass);
// Populate the cache for hierarchical keys (only if in verify mode)
if (is_null($oChange))
{
@@ -658,7 +652,7 @@ class BulkChange
foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
{
$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
if (!$this->IsNullExternalKeySpec($aRowData, $sAttCode) && $oExtKey->IsHierarchicalKey())
if (!$this->IsNullExternalKeySpec($aRowData, $sAttCode) && MetaModel::IsParentClass(get_class($oTargetObj), $this->m_sClass))
{
// 2. Populate the cache for further checks
$aCacheKeys = array();
@@ -671,6 +665,11 @@ class BulkChange
}
else
{
if (!isset($this->m_aAttList[$sForeignAttCode]) || !isset($aRowData[$this->m_aAttList[$sForeignAttCode]]))
{
// the key is not in the import
break 2;
}
$value = $aRowData[$this->m_aAttList[$sForeignAttCode]];
}
$aCacheKeys[] = $value;
@@ -690,7 +689,7 @@ class BulkChange
if (count($aErrors) > 0)
{
//$sErrors = implode(', ', $aErrors);
$sErrors = implode(', ', $aErrors);
$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
return $oTargetObj;
}
@@ -743,7 +742,7 @@ class BulkChange
if (count($aErrors) > 0)
{
//$sErrors = implode(', ', $aErrors);
$sErrors = implode(', ', $aErrors);
$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
return;
}
@@ -784,7 +783,7 @@ class BulkChange
if (count($aErrors) > 0)
{
//$sErrors = implode(', ', $aErrors);
$sErrors = implode(', ', $aErrors);
$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
return;
}

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)

11
core/valuesetdef.class.inc.php
View File

@@ -202,13 +202,10 @@ class ValueSetObjects extends ValueSetDefinition
}
}
if (!empty($sContains))
{
$oValueExpr = new ScalarExpression('%'.$sContains.'%');
$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
$oFilter->AddConditionExpression($oNewCondition);
}
$oValueExpr = new ScalarExpression('%'.$sContains.'%');
$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
$oFilter->AddConditionExpression($oNewCondition);
$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
while ($oObject = $oObjects->Fetch())