composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent infinite cross-ticket recursion when propagating parent->child resolution in tickets.

Browse Source 
SVN:trunk[4045]
This commit is contained in:
Denis Flaven
2016-05-10 15:33:48 +00:00
parent a618f2804b
commit 89328e1662
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
View File

@@ -1164,15 +1164,22 @@
</arguments> </arguments>
<code><![CDATA[ public function ResolveChildTickets() <code><![CDATA[ public function ResolveChildTickets()
{ {
static $aRequests = array(); // prevent infinite recursion
static $Incidents = array(); // prevent infinite recursion
if (MetaModel::IsValidClass('UserRequest')) if (MetaModel::IsValidClass('UserRequest'))
{ {
// Automatically resolve child requests // Automatically resolve child requests
$sOQL = "SELECT UserRequest WHERE parent_incident_id = :ticket AND status != 'resolved'"; $sOQL = "SELECT UserRequest WHERE parent_incident_id = :ticket AND status != 'resolved'";
$oChildRequestSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey())); $oChildRequestSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey()));
while($oRequest = $oChildRequestSet->Fetch()) while($oRequest = $oChildRequestSet->Fetch())
{ {
$oRequest->ResolveFrom($this); if (!array_key_exists($oRequest->GetKey(), $aRequests))
} {
$aRequests[$oRequest->GetKey()] = true;
$oRequest->ResolveFrom($this);
}
}
} }
// Automatically resolve child incidents // Automatically resolve child incidents
@@ -1180,7 +1187,11 @@
$oChildIncidentSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey())); $oChildIncidentSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey()));
while($oIncident = $oChildIncidentSet->Fetch()) while($oIncident = $oChildIncidentSet->Fetch())
{ {
$oIncident->ResolveFrom($this); if (!array_key_exists($oIncident->GetKey(), $Incidents))
{
$Incidents[$oIncident->GetKey()] = true;
$oIncident->ResolveFrom($this);
}
} }
return true; return true;
}]]></code> }]]></code>

8
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -1278,12 +1278,18 @@
</arguments> </arguments>
<code><![CDATA[ public function ResolveChildTickets() <code><![CDATA[ public function ResolveChildTickets()
{ {
static $aTickets = array(); // prevent infinite recursion
// Automatically resolve child requests // Automatically resolve child requests
$sOQL = "SELECT UserRequest WHERE parent_request_id = :ticket AND status != 'resolved'"; $sOQL = "SELECT UserRequest WHERE parent_request_id = :ticket AND status != 'resolved'";
$oChildRequestSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey())); $oChildRequestSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey()));
while($oRequest = $oChildRequestSet->Fetch()) while($oRequest = $oChildRequestSet->Fetch())
{ {
$oRequest->ResolveFrom($this); if (!array_key_exists($oRequest->GetKey(), $aTickets))
{
$aTickets[$oRequest->GetKey()] = true;
$oRequest->ResolveFrom($this);
}
} }
return true; return true;
}]]></code> }]]></code>

8
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

@@ -1280,12 +1280,18 @@
</arguments> </arguments>
<code><![CDATA[ public function ResolveChildTickets() <code><![CDATA[ public function ResolveChildTickets()
{ {
static $aTickets = array(); // prevent infinite recursion
// Automatically resolve child requests // Automatically resolve child requests
$sOQL = "SELECT UserRequest WHERE parent_request_id = :ticket AND status != 'resolved'"; $sOQL = "SELECT UserRequest WHERE parent_request_id = :ticket AND status != 'resolved'";
$oChildRequestSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey())); $oChildRequestSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('ticket' => $this->GetKey()));
while($oRequest = $oChildRequestSet->Fetch()) while($oRequest = $oChildRequestSet->Fetch())
{ {
$oRequest->ResolveFrom($this); if (!array_key_exists($oRequest->GetKey(), $aTickets))
{
$aTickets[$oRequest->GetKey()] = true;
$oRequest->ResolveFrom($this);
}
} }
return true; return true;
}]]></code> }]]></code>