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

- Fix for bug #420: error message too long

Browse Source 
- Fix for bug #424: error when processing unmodified replicas

SVN:1.1[1331]
This commit is contained in:
Denis Flaven
2011-07-05 13:27:26 +00:00
parent 71d3a9e443
commit 92b3434954
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
synchro/synchrodatasource.class.inc.php
View File

@@ -1299,7 +1299,7 @@ class SynchroLog extends DBObject
MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_updated", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_updated", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_unchanged", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_unchanged", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeText("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeLongText("traces", array("allowed_values"=>null, "sql"=>"traces", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
// Display lists
@@ -1603,7 +1603,7 @@ class SynchroReplica extends DBObject implements iDisplay
}
else
{
$this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj', 'stats_nb_obj_updated_errors');
$this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, '', 'stats_nb_obj_updated_errors');
}
break;
@@ -1633,13 +1633,19 @@ class SynchroReplica extends DBObject implements iDisplay
{
$oDestObj->DBUpdateTracked($oChange);
$oStatLog->AddTrace('Updated object - Values: {'.implode(', ', $aValueTrace).'}', $this);
$oStatLog->Inc($sStatsCode.'_updated');
if ($sStatsCode != '')
{
$oStatLog->Inc($sStatsCode.'_updated');
}
$this->Set('info_last_modified', date('Y-m-d H:i:s'));
}
else
{
$oStatLog->AddTrace('Unchanged object', $this);
$oStatLog->Inc($sStatsCode.'_unchanged');
if ($sStatsCode != '')
{
$oStatLog->Inc($sStatsCode.'_unchanged');
}
}
$this->Set('status_last_error', '');