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°4519 Reload ormLinkset during \DBObject::DBWriteLinks

Browse Source 
This will fix a bug when doing a DBUpdate() inside \iApplicationObjectExtension::OnDBInsert : if nothing done (no Set() call for example) then \DBObject::ListChanges will return a change in all non empty ormLinkset.

With this fix, no change will be returned.
This commit is contained in:
Pierre Goiffon
2021-12-13 16:46:21 +01:00
parent 6254617814
commit dcf872bcd5
1 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/ormlinkset.class.inc.php
View File

@@ -719,70 +719,68 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
{
unset($this->aRemoved[$sLinkKey]);
}
$bIsDuplicate = true;
break;
$bIsDuplicate = true;
break;
}
}
if ($bIsDuplicate)
{
continue;
}
if ($bIsDuplicate) {
continue;
}
}
}
else
{
if (!array_key_exists($oLink->GetKey(), $aExistingLinks))
{
} else {
if (!array_key_exists($oLink->GetKey(), $aExistingLinks)) {
$oLink->DBClone();
}
}
$oLink->DBWrite();
$this->aPreserved[$oLink->GetKey()] = $oLink;
$this->aOriginalObjects[$oLink->GetKey()] = $oLink;
}
foreach ($this->aRemoved as $iLinkId)
{
if (array_key_exists($iLinkId, $aExistingLinks))
{
$this->aAdded = [];
foreach ($this->aRemoved as $iLinkId) {
if (array_key_exists($iLinkId, $aExistingLinks)) {
$oLink = $aExistingLinks[$iLinkId];
if ($oAttDef->IsIndirect())
{
if ($oAttDef->IsIndirect()) {
$oLink->DBDelete();
}
else
{
} else {
$oExtKeyToRemote = MetaModel::GetAttributeDef($this->sClass, $sExtKeyToMe);
if ($oExtKeyToRemote->IsNullAllowed())
{
if ($oLink->Get($sExtKeyToMe) == $oHostObject->GetKey())
{
if ($oExtKeyToRemote->IsNullAllowed()) {
if ($oLink->Get($sExtKeyToMe) == $oHostObject->GetKey()) {
// Detach the link object from this
$oLink->Set($sExtKeyToMe, 0);
$oLink->DBUpdate();
}
}
else
{
} else {
$oLink->DBDelete();
}
}
unset($this->aPreserved[$oLink->GetKey()], $this->aOriginalObjects[$oLink->GetKey()]);
}
}
$this->aRemoved = [];
// Note: process modifications at the end: if a link to remove has also been listed as modified, then it will be gracefully ignored
foreach ($this->aModified as $iLinkId => $oLink)
{
if (array_key_exists($oLink->GetKey(), $aExistingLinks))
{
foreach ($this->aModified as $iLinkId => $oLink) {
if (array_key_exists($oLink->GetKey(), $aExistingLinks)) {
$oLink->DBUpdate();
}
else
{
} else {
$oLink->DBClone();
}
$this->aPreserved[$oLink->GetKey()] = $oLink;
$this->aOriginalObjects[$oLink->GetKey()] = $oLink;
}
$this->aModified = [];
// End of the critical section
//
$oMtx->Unlock();
// we updated the instance (original/preserved/added/modified/removed arrays) all along the way
$this->bHasDelta = false;
$this->oOriginalSet->GetFilter()->SetInternalParams(['id', $oHostObject->GetKey()]);
}
/**