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

Fixed issue #28, objects not created by the CSV import because mandatory external keys are not in the column set.

Browse Source 
SVN:trunk[95]
This commit is contained in:
Romain Quetiez
2009-08-21 15:20:35 +00:00
parent 12e433846f
commit ff6a5a45ee
2 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -335,10 +335,22 @@ class BulkChange
}
// Check that any external key will have a value proposed
// Could be said once for all rows !!!
foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAtt)
$aMissingKeys = array();
foreach (MetaModel::GetExternalKeys($this->m_sClass) as $sExtKeyAttCode => $oExtKey)
{
if (!$oAtt->IsExternalKey()) continue;
if (!$oExtKey->IsNullAllowed())
{
if (!array_key_exists($sExtKeyAttCode, $this->m_aExtKeys) && !array_key_exists($sExtKeyAttCode, $this->m_aAttList))
{
$aMissingKeys[] = $oExtKey->GetLabel();
}
}
}
if (count($aMissingKeys) > 0)
{
$sMissingKeys = implode(', ', $aMissingKeys);
$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue("Could not be created, due to missing external key(s): $sMissingKeys");
return;
}
// Optionaly record the results

42
pages/csvimport.php
View File

@@ -393,6 +393,7 @@ function DoProcessOrVerify($oPage, $sClass, CMDBChange $oChange = null)
$aSampleData = $oCSVParser->ToArray(array_keys($aFieldMap), 5);
$aDisplayConfig = array();
$aExtKeys = array();
foreach ($aFieldMap as $sFieldId=>$sColDesc)
{
if (array_key_exists($sFieldId, $aIsReconcKey))
@@ -417,11 +418,16 @@ function DoProcessOrVerify($oPage, $sClass, CMDBChange $oChange = null)
$sAttCode = $sColDesc;
$sLabel = MetaModel::GetAttributeDef($sClass, $sAttCode)->GetLabel();
$aDisplayConfig[$sFieldId] = array("label"=>"$sLabel$sReconcKey", "description"=>"");
if (MetaModel::IsValidKeyAttCode($sClass, $sAttCode))
{
$aExtKeys[] = $sAttCode;
}
}
elseif (IsExtKeyField($sColDesc))
{
list($sExtKeyAttCode, $sForeignAttCode) = GetExtKeyFieldCodes($sColDesc);
$aDisplayConfig[$sFieldId] = array("label"=>MakeExtFieldLabel($sClass, $sExtKeyAttCode, $sForeignAttCode), "description"=>"");
$aExtKeys[] = $sExtKeyAttCode;
}
else
{
@@ -437,17 +443,39 @@ function DoProcessOrVerify($oPage, $sClass, CMDBChange $oChange = null)
}
else
{
$oPage->p("<h2>Column consistency</h2>");
$aMissingKeys = array();
foreach (MetaModel::GetExternalKeys($sClass) as $sExtKeyAttCode => $oExtKey)
{
if (!in_array($sExtKeyAttCode, $aExtKeys) && !$oExtKey->IsNullAllowed())
{
$aMissingKeys[$sExtKeyAttCode] = $oExtKey;
}
}
if (count($aMissingKeys) > 0)
{
$oPage->p("Warning: the objects could not be created, due to some missing mandatory external keys in the field list: ");
$oPage->p("<ul>");
foreach($aMissingKeys as $sAttCode => $oAttDef)
{
$oPage->p("<li>".$oAttDef->GetLabel()."</li>");
}
$oPage->p("</ul>");
}
$oPage->p("<h2>Check...</h2>");
}
ProcessData($oPage, $sClass, $oCSVParser, $aFieldMap, $aIsReconcKey, $oChange);
$oPage->add("<form method=\"post\" action=\"\">");
$oPage->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">");
$oPage->add("<input type=\"hidden\" name=\"csvdata\" value=\"$sCSVData\">");
$oPage->add("<input type=\"hidden\" name=\"separator\" value=\"$sSep\">");
$oPage->add("<input type=\"hidden\" name=\"skiplines\" value=\"$iSkip\">");
$oPage->add("<form method=\"post\" action=\"\">");
$oPage->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">");
$oPage->add("<input type=\"hidden\" name=\"csvdata\" value=\"$sCSVData\">");
$oPage->add("<input type=\"hidden\" name=\"separator\" value=\"$sSep\">");
$oPage->add("<input type=\"hidden\" name=\"skiplines\" value=\"$iSkip\">");
$oPage->add_input_hidden("fmap", $aFieldMap);
$oPage->add_input_hidden("iskey", $aIsReconcKey);
return;
}
function Do_Verify($oPage, $sClass)
@@ -459,8 +487,8 @@ function Do_Verify($oPage, $sClass)
// FORM started by DoProcessOrVerify...
$oPage->add("<input type=\"hidden\" name=\"fromwiztep\" value=\"$sWiztep\">");
$oPage->add("<input type=\"submit\" name=\"todo\" value=\"Back\">");
$oPage->add("<input type=\"submit\" name=\"todo\" value=\"Next\">");
$oPage->add("<input type=\"submit\" name=\"todo\" value=\"Back\">");
$oPage->add("<input type=\"submit\" name=\"todo\" value=\"Next\">");
$oPage->add("</form>");
}