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

New CRUD behaviour (removed Reload in DBInsert and DBUpdate) and protection against reentrance

Browse Source
This commit is contained in:
Eric Espie
2022-05-27 17:46:10 +02:00
parent e7c09c83f0
commit af4a5e1b8d
7 changed files with 513 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
application/cmdbabstract.class.inc.php
View File

@@ -4435,7 +4435,15 @@ HTML;
*/
public function DBInsertNoReload()
{
$res = parent::DBInsertNoReload();
return $this->DBInsert();
}
/**
* @inheritdoc
*/
public function DBInsert()
{
$res = parent::DBInsert();
$this->SetWarningsAsSessionMessages('create');
@@ -4480,13 +4488,13 @@ HTML;
// Protection against reentrance (e.g. cascading the update of ticket logs)
// Note: This is based on the fix made on r 3190 in DBObject::DBUpdate()
static $aUpdateReentrance = array();
$sKey = get_class($this).'::'.$this->GetKey();
if (array_key_exists($sKey, $aUpdateReentrance))
{
if (!MetaModel::StartReentranceProtection($this)) {
$sClass = get_class($this);
$sKey = $this->GetKey();
IssueLog::Debug("CRUD: DBUpdate $sClass::$sKey Rejected (reentrance)", LogChannels::DM_CRUD);
return $res;
}
$aUpdateReentrance[$sKey] = true;
try
{
@@ -4497,13 +4505,13 @@ HTML;
$oExtensionInstance->OnDBUpdate($this, self::GetCurrentChange());
}
}
catch (Exception $e)
{
throw $e;
}
finally
{
unset($aUpdateReentrance[$sKey]);
MetaModel::StopReentranceProtection($this);
}
if ($this->IsModified()) {
return $this->DBUpdate();
}
return $res;