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

N°4988 - History API : change consumers (iTop core)

Browse Source
This commit is contained in:
acognet
2022-06-28 11:30:16 +02:00
parent b47d3cda12
commit bf01be6f19
3 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/csvimport.php
View File

@@ -360,7 +360,6 @@ try {
CMDBObject::SetCurrentChangeFromParams($sUserString, CMDBChangeOrigin::CSV_INTERACTIVE);
$oMyChange = CMDBObject::GetCurrentChange();
}
CMDBObject::SetTrackOrigin('csv-interactive');
$oBulk = new BulkChange(
$sClassName,

35
webservices/backoffice.dataloader.php
View File

@@ -90,48 +90,37 @@ try
// Note: the data model must be loaded first
$oDataLoader = new XMLDataLoader();
if (empty($sFileName))
{
if (empty($sFileName)) {
throw(new Exception("Missing argument 'file'"));
}
if (!file_exists($sFileName))
{
if (!file_exists($sFileName)) {
throw(new Exception("File $sFileName does not exist"));
}
SetMemoryLimit($oP);
// The XMLDataLoader constructor has initialized the DB, let's start a transaction
CMDBSource::Query('START TRANSACTION');
$oChange = MetaModel::NewObject("CMDBChange");
$oChange->Set("date", time());
$oChange->Set("userinfo", "Initialization");
$iChangeId = $oChange->DBInsert();
$oP->p("Starting data load.");
$oDataLoader->StartSession($oChange);
$oP->p("Starting data load.");
CMDBObject::SetCurrentChangeFromParams('Initialization WS');
$oDataLoader->StartSession(CMDBObject::GetCurrentChange());
$oDataLoader->LoadFile($sFileName);
$oP->p("Ending data load session");
if ($oDataLoader->EndSession(true /* strict */))
{
if ($oDataLoader->EndSession(true /* strict */)) {
$iCountCreated = $oDataLoader->GetCountCreated();
CMDBSource::Query('COMMIT');
$oP->p("Data successfully written into the DB: $iCountCreated objects created");
}
else
{
} else {
CMDBSource::Query('ROLLBACK');
$oP->p("Some issues have been encountered, changes will not be recorded, please review the source data");
$aErrors = $oDataLoader->GetErrors();
if (count($aErrors) > 0)
{
if (count($aErrors) > 0) {
$oP->p('Errors ('.count($aErrors).')');
foreach ($aErrors as $sMsg)
{
foreach ($aErrors as $sMsg) {
$oP->p(' * '.$sMsg);
}
}

11
webservices/import.php
View File

@@ -713,17 +713,12 @@ try
}
else
{
if (strlen($sComment) > 0)
{
if (strlen($sComment) > 0) {
$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV) - '.$sComment;
}
else
{
} else {
$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV)';
}
CMDBObject::SetTrackInfo($sMoreInfo);
CMDBObject::SetTrackOrigin('csv-import.php');
CMDBObject::SetCurrentChangeFromParams($sMoreInfo, 'csv-import.php');
$oMyChange = CMDBObject::GetCurrentChange();
}