From 3a931ff79e1392c80cb10a14df229fd2fa5590e7 Mon Sep 17 00:00:00 2001
From: BenGrenoble <benjamin.planque@combodo.com>
Date: Thu, 9 Feb 2023 11:32:57 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B05968=20-=20Add=20structural=20data=20for?=
 =?UTF-8?q?=20Brand,=20OSFamily=20and=20OSVersion=20Change=20path=20and=20?=
 =?UTF-8?q?correct=20osversion=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-bridge-cmdb-services/extension.xml   | 9 ---------
 datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml     | 9 ---------
 .../itop-config-mgmt/data/en_us.data.itop-osversion.xml  | 2 +-
 .../2.x/itop-config-mgmt/module.itop-config-mgmt.php     | 7 +++----
 4 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 datamodels/2.x/itop-bridge-cmdb-services/extension.xml
 delete mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml

diff --git a/datamodels/2.x/itop-bridge-cmdb-services/extension.xml b/datamodels/2.x/itop-bridge-cmdb-services/extension.xml
deleted file mode 100644
index d6fa5d3a0..000000000
--- a/datamodels/2.x/itop-bridge-cmdb-services/extension.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension format="1.0">
-  <extension_code>itop-bridge-cmdb-services</extension_code>
-  <version>1.0.0</version>
-  <label><![CDATA[Bridge for CMDB and Services]]></label>
-  <description><![CDATA[This module adds lnk between classes brought by CMDB and Services]]></description>
-  <mandatory>false</mandatory>
-  <more_info_url></more_info_url>
-</extension>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml
deleted file mode 100644
index 6d4b9b967..000000000
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension format="1.0">
-  <extension_code>itop-bridge-cmdb-ticket</extension_code>
-  <version>1.0.0</version>
-  <label><![CDATA[Bridge for CMDB and Ticket]]></label>
-  <description><![CDATA[This module adds lnk between classes brought by CMDB and Ticket]]></description>
-  <mandatory>false</mandatory>
-  <more_info_url></more_info_url>
-</extension>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osversion.xml b/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osversion.xml
index fcbaf8630..985986b9e 100755
--- a/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osversion.xml
+++ b/datamodels/2.x/itop-config-mgmt/data/en_us.data.itop-osversion.xml
@@ -103,7 +103,7 @@
         <finalclass>OS Version</finalclass>
         <friendlyname>9.1</friendlyname>
     </OSVersion>
-    <OSVersion alias="OSVersion" id="140">
+    <OSVersion alias="OSVersion" id="14">
         <name>Roling release</name>
         <osfamily_id>1</osfamily_id>
         <osfamily_id_friendlyname>Arch</osfamily_id_friendlyname>
diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
index fd175559c..f03d7c419 100755
--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -26,9 +26,9 @@ SetupWebPage::AddModule(
 			'main.itop-config-mgmt.php',
 		),
 		'data.struct' => array(
-			'./data/en_us.data.itop-brand.xml',
-			'./data/en_us.data.itop-osfamily.xml',
-			'./data/en_us.data.itop-osversion.xml',
+			'data/en_us.data.itop-brand.xml',
+			'data/en_us.data.itop-osfamily.xml',
+			'data/en_us.data.itop-osversion.xml',
 		),
 		'data.sample' => array(
 			'data.sample.model.xml',
@@ -44,7 +44,6 @@ SetupWebPage::AddModule(
 			'data.sample.webapp.xml',
 			'data.sample.applications.xml',
 			'data.sample.applicationsolutionci.xml',
-
 		),
 		
 		// Documentation