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

EventService: refactoring

Browse Source
This commit is contained in:
Eric Espie
2022-03-15 17:50:13 +01:00
parent 5b52ca4776
commit 29c6b73d93
30 changed files with 914 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
View File

@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
<meta>
<events>
<event id="DisplayObjectDetails" _delta="define">
<description>An object details is about to be displayed to a user</description>
<available_filters>Class hierarchy of the displayed object</available_filters>
<arguments>
<argument id="object">
<description>The object displayed</description>
<type>DBObject</type>
</argument>
<argument id="debug_info">
<description>Debug string</description>
<type>string</type>
</argument>
</arguments>
</event>
</events>
</meta>
<itop_design version="3.1">
<events>
<event id="DisplayObjectDetails" _delta="define">
<description>An object details is about to be displayed to a user</description>
<available_filters>Class hierarchy of the displayed object</available_filters>
<arguments>
<argument id="object">
<description>The object displayed</description>
<type>DBObject</type>
</argument>
<argument id="debug_info">
<description>Debug string</description>
<type>string</type>
</argument>
</arguments>
</event>
</events>
</itop_design>

4
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -29,8 +29,6 @@ use BinaryExpression;
use Combodo\iTop\Portal\Brick\CreateBrick;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use Combodo\iTop\Service\EventService;
use Combodo\iTop\Service\EventName;
use DBObject;
use DBObjectSearch;
use DBObjectSet;
@@ -197,7 +195,7 @@ class ObjectController extends BrickController
$sObjectClass = get_class($oObject);
$sObjectId = $oObject->GetKey();
$oObject->FireEvent(EventName::DISPLAY_OBJECT_DETAILS);
$oObject->FireEvent(EVENT_SERVICE_DISPLAY_OBJECT_DETAILS);
$aData = array('sMode' => 'view');
$aData['form'] = $oObjectFormHandler->HandleForm($oRequest, $aData['sMode'], $sObjectClass, $sObjectId);