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

#489 Data synchro: reintegrated the latest improvements from trunk.

Browse Source 
SVN:1.2[1740]
This commit is contained in:
Romain Quetiez
2011-12-21 13:45:07 +00:00
parent 912088d017
commit 489be44b90
17 changed files with 1448 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/dbobject.class.php
View File

@@ -932,7 +932,7 @@ abstract class DBObject
$oDeletionPlan->AddToDelete($oReplica, DEL_SILENT);
if ($oDataSource->GetKey() == SynchroDataSource::GetCurrentTaskId())
if ($oDataSource->GetKey() == SynchroExecution::GetCurrentTaskId())
{
// The current task has the right to delete the object
continue;
@@ -1862,7 +1862,7 @@ abstract class DBObject
$oSet = $this->GetMasterReplica();
while($aData = $oSet->FetchAssoc())
{
if ($aData['datasource']->GetKey() == SynchroDataSource::GetCurrentTaskId())
if ($aData['datasource']->GetKey() == SynchroExecution::GetCurrentTaskId())
{
// Ignore the current task (check to write => ok)
continue;