From b9d865f881c7070c8f4399b5f0ea2306f76181c2 Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Wed, 21 Sep 2022 18:08:44 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B04756=20-=20Fix=20DBInsert/NoReload=20cal?=
 =?UTF-8?q?l=20order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/cmdbabstract.class.inc.php                 | 10 +---------
 core/dbobject.class.php                                |  6 +++---
 .../itop-attachments/datamodel.itop-attachments.xml    |  2 ++
 .../itop-portal-base/datamodel.itop-portal-base.xml    |  4 +++-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 2a2f9495b..924b45e42 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -4435,15 +4435,7 @@ HTML;
 	 */
 	public function DBInsertNoReload()
 	{
-		return $this->DBInsert();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function DBInsert()
-	{
-		$res = parent::DBInsert();
+		$res = parent::DBInsertNoReload();
 
 		$this->SetWarningsAsSessionMessages('create');
 
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 1dfbb4469..ca77b462e 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -2815,9 +2815,9 @@ abstract class DBObject implements iDisplay
 	 * @internal
 	 *
 	 */
-	public function DBInsertNoReload()
+	public function DBInsert()
 	{
-		return $this->DBInsert();
+		return $this->DBInsertNoReload();
 	}
 
     /**
@@ -2943,7 +2943,7 @@ abstract class DBObject implements iDisplay
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
-	public function DBInsert()
+	public function DBInsertNoReload()
 	{
 		$sClass = get_class($this);
         if (MetaModel::DBIsReadOnly())
diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
index 63ce7430d..50eb1e808 100755
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -261,6 +261,7 @@
       <replaces>Attachment::AfterUpdate</replaces>
       <sources>
         <source id="Attachment">Attachment</source>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
       <event_data>
         <event_datum id="object">
@@ -282,6 +283,7 @@
       <replaces>Attachment::AfterUpdate</replaces>
       <sources>
         <source id="Attachment">Attachment</source>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
       </sources>
       <event_data>
         <event_datum id="object">
diff --git a/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml b/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
index 6dfefe935..101553db3 100644
--- a/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
+++ b/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
@@ -3,7 +3,9 @@
   <events>
     <event id="EVENT_SERVICE_DISPLAY_OBJECT_DETAILS" _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>
+      <sources>
+        <source id="cmdbAbstractObject">cmdbAbstractObject</source>
+      </sources>
       <arguments>
         <argument id="object">
           <description>The object displayed</description>