composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cosmetic issues in the CSV import (related to the recent changes)

Browse Source 
SVN:trunk[1005]
This commit is contained in:
Romain Quetiez
2010-12-01 16:27:11 +00:00
parent dc96cbc482
commit d4eaf43257
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,7 +516,7 @@ class BulkChange
{
$sErrors = implode(', ', $aErrors);
$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue("Unexpected attribute value(s)");
return;
return $oTargetObj;
}
// Check that any external key will have a value proposed
@@ -535,7 +535,7 @@ class BulkChange
{
$sMissingKeys = implode(', ', $aMissingKeys);
$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue("Could not be created, due to missing external key(s): $sMissingKeys");
return;
return $oTargetObj;
}
// Optionaly record the results

4
pages/csvimport.php
View File

@@ -596,13 +596,13 @@ try
$fErrorsPercentage = (100.0*$iErrors)/count($aRes);
if ($fErrorsPercentage >= utils::GetConfig()->Get('csv_import_errors_percentage'))
{
$sMessage = sprintf("%.0f %% of the loaded objects will be modified.", $fErrorsPercentage);
$sMessage = sprintf("%.0f %% of the loaded objects have errors and will be ignored.", $fErrorsPercentage);
$bShouldConfirm = true;
}
$fCreatedPercentage = (100.0*$iCreated)/count($aRes);
if ($fCreatedPercentage >= utils::GetConfig()->Get('csv_import_creations_percentage'))
{
$sMessage = sprintf("%.0f %% of the loaded objects will be modified.", $fCreatedPercentage);
$sMessage = sprintf("%.0f %% of the loaded objects will be created.", $fCreatedPercentage);
$bShouldConfirm = true;
}
$fModifiedPercentage = (100.0*$iModified)/count($aRes);