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

Merge remote-tracking branch 'origin/support/3.1' into develop

Browse Source
This commit is contained in:
Eric Espie
2023-12-12 17:16:58 +01:00
parent 45c50995e3 fc2be85c95
commit 4a164f9c01
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1493,10 +1493,9 @@
<code><![CDATA[ protected function OnInsert()
{
parent::OnInsert();
$this->ComputeImpactedItems();
$this->SetIfNull('last_update', time());
$this->SetIfNull('start_date', time());
parent::OnInsert();
$this->SetIfNull('last_update', time());
$this->SetIfNull('start_date', time());
}]]></code>
</method>
<method id="OnUpdate">

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

@@ -1567,7 +1567,6 @@
protected function OnInsert()
{
parent::OnInsert();
$this->ComputeImpactedItems();
$this->SetIfNull('last_update', time());
$this->SetIfNull('start_date', time());
}]]></code>

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

@@ -1608,11 +1608,9 @@
<code><![CDATA[
protected function OnInsert()
{
parent::OnInsert();
$this->ComputeImpactedItems();
$this->SetIfNull('last_update', time());
$this->SetIfNull('start_date', time());
parent::OnInsert();
$this->SetIfNull('last_update', time());
$this->SetIfNull('start_date', time());
}]]></code>
</method>
<method id="OnUpdate">

13
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -224,11 +224,22 @@
<event_listeners>
<event_listener id="UpdateImpactAnalysis">
<event>EVENT_DB_LINKS_CHANGED</event>
<callback>UpdateImpactedItems</callback>
<callback>OnLinksChangedTicket</callback>
<rank>0</rank>
</event_listener>
</event_listeners>
<methods>
<method id="OnLinksChangedTicket">
<static>false</static>
<access>public</access>
<type>EventListener</type>
<code><![CDATA[
public function OnLinksChangedTicket(Combodo\iTop\Service\Events\EventData $oEventData)
{
$this->UpdateImpactedItems();
}
]]></code>
</method>
<method id="DBInsertNoReload">
<static>false</static>
<access>public</access>

3
tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
View File

@@ -83,6 +83,7 @@ class TransactionsTest extends ItopTestCase
$oLinkSet = $oTicket->Get('contacts_list');
$oLinkSet->AddItem(MetaModel::NewObject('lnkContactToTicket', ['contact_id' => 6]));
$oLinkSet->AddItem(MetaModel::NewObject('lnkContactToTicket', ['contact_id' => 7]));
$oTicket->Set('contacts_list', $oLinkSet);
$this->oMySQLiMock->SetFailAt($iFailAt);
$this->debug("---> DBInsert()");
@@ -188,7 +189,7 @@ class TransactionsTest extends ItopTestCase
$oLinkSet = $oTicket->Get('contacts_list');
$oLinkSet->AddItem(MetaModel::NewObject('lnkContactToTicket', ['contact_id' => 6]));
$oLinkSet->AddItem(MetaModel::NewObject('lnkContactToTicket', ['contact_id' => 7]));
//$oTicket->Set('contacts_list', $oLinkSet);
$oTicket->Set('contacts_list', $oLinkSet);
$this->oMySQLiMock->SetShowRequest(false);
$oTicket->DBWrite();