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

Stop watches - removed inefficient workaround to issue #502 (modif not recorded in the history), the issue #502 must be fixed properly

Browse Source 
SVN:trunk[2175]
This commit is contained in:
Romain Quetiez
2012-09-11 14:29:41 +00:00
parent 7026eb3b76
commit e47251f2f4
2 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/attributedef.class.inc.php
View File

@@ -3372,24 +3372,6 @@ class AttributeStopWatch extends AttributeDefinition
return $proposedValue;
}
public function Equals($val1, $val2)
{
if ($val1 === $val2) return true;
if (is_object($val1) != is_object($val2))
{
return false;
}
if (!is_object($val1))
{
// string ?
return false;
}
// Both values are Object sets
return $val1->HasSameContents($val2);
}
public function GetSQLExpressions($sPrefix = '')
{
if ($sPrefix == '')

26
core/ormstopwatch.class.inc.php
View File

@@ -54,32 +54,6 @@ class ormStopWatch
$this->aThresholds = array();
}
// BUGGY - DOES NOT DETECT A CHANGE IN THE DEADLINE
//
public function HasSameContents($oStopWatch)
{
if ($oStopWatch->iTimeSpent != $this->iTimeSpent) return false;
if ($oStopWatch->iStarted != $this->iStarted) return false;
if ($oStopWatch->iLastStart != $this->iLastStart) return false;
if ($oStopWatch->iStopped != $this->iStopped) return false;
if ($oStopWatch->aThresholds != $this->aThresholds) return false;
// Array comparison is not recursive... let's do it by myself
foreach ($oStopWatch->aThresholds as $iPercent => $aThresholdData)
{
// Assumption: the thresholds will not change dynamically (defined at application design time)
$aThisThresholdData = $this->aThresholds[$iPercent];
if ($aThisThresholdData['deadline'] != $aThresholdData['deadline']) return false;
if ($aThisThresholdData['passed'] != $aThresholdData['passed']) return false;
if ($aThisThresholdData['triggered'] != $aThresholdData['triggered']) return false;
if ($aThisThresholdData['overrun'] != $aThresholdData['overrun']) return false;
}
return false;
return true;
}
/**
* Necessary for the triggers
*/