From 1f092f8418ccc85fec181bf3c56eebab0032b09e Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 27 Oct 2020 09:45:26 +0100 Subject: [PATCH 01/13] :art: Integration test code formatting --- .../iTopModulesPhpVersionChecklistTest.php | 18 ++++++------------ .../iTopModulesXmlVersionChecklistTest.php | 13 +++++-------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php index c5bfd00f8..24695aa1f 100644 --- a/test/integration/iTopModulesPhpVersionChecklistTest.php +++ b/test/integration/iTopModulesPhpVersionChecklistTest.php @@ -16,7 +16,6 @@ namespace Combodo\iTop\Test\UnitTest\Integration; use Combodo\iTop\Test\UnitTest\ItopTestCase; -use DOMDocument; use iTopDesignFormat; @@ -57,7 +56,8 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase $matches ); - $this->assertRegExp("#$sExpectedVersion#", $matches[1], " $sPhpFile:2 file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)"); + $this->assertRegExp("#$sExpectedVersion#", $matches[1], + " $sPhpFile:2 file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)"); } @@ -68,16 +68,11 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase require_once APPROOT.'core/config.class.inc.php'; require_once APPROOT.'application/utils.inc.php'; - if (is_dir(APPROOT.'datamodels/2.x')) - { + if (is_dir(APPROOT.'datamodels/2.x')) { $DatamodelsPath = APPROOT.'datamodels/2.x'; - } - elseif (is_dir(APPROOT.'datamodels/1.x')) - { + } elseif (is_dir(APPROOT.'datamodels/1.x')) { $DatamodelsPath = APPROOT.'datamodels/1.x'; - } - else - { + } else { throw new \Exception('Cannot local the datamodels directory'); } @@ -87,8 +82,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase $sExpectedVersion = \utils::GetItopMinorVersion().'\.\d+'; // ie: 2.7\.\d+ (and yes, the 1st dot should be escaped, but, hey, it is good enough as it, ans less complex to read) $aTestCases = array(); - foreach ($aPhpFiles as $sPhpFile) - { + foreach ($aPhpFiles as $sPhpFile) { $aTestCases[$sPhpFile] = array( 'sExpectedVersion' => $sExpectedVersion, 'sPhpFile' => $sPhpFile, diff --git a/test/integration/iTopModulesXmlVersionChecklistTest.php b/test/integration/iTopModulesXmlVersionChecklistTest.php index 0ff89f3f0..44bb2e5a8 100644 --- a/test/integration/iTopModulesXmlVersionChecklistTest.php +++ b/test/integration/iTopModulesXmlVersionChecklistTest.php @@ -57,14 +57,12 @@ class iTopModulesXmlVersionIntegrationTest extends ItopTestCase $oTransformedXml->load($sXmlFile); $oFormat = new iTopDesignFormat($oTransformedXml); - if ($oFormat->Convert()) - { + if ($oFormat->Convert()) { // Compare the original and new format $sExpectedXmlVersion = ITOP_DESIGN_LATEST_VERSION; - $this->assertSame($oTransformedXml->saveXML(), $oOriginalXml->saveXML(), "Datamodel file $sXmlFile:2 not in the latest format ($sExpectedXmlVersion)"); - } - else - { + $this->assertSame($oTransformedXml->saveXML(), $oOriginalXml->saveXML(), + "Datamodel file $sXmlFile:2 not in the latest format ($sExpectedXmlVersion)"); + } else { $this->fail("Failed to convert $sXmlFile into the latest format"); } } @@ -80,8 +78,7 @@ class iTopModulesXmlVersionIntegrationTest extends ItopTestCase $aXmlFiles[] = APPROOT.'application/datamodel.application.xml'; $aTestCases = array(); - foreach ($aXmlFiles as $sXmlFile) - { + foreach ($aXmlFiles as $sXmlFile) { $aTestCases[$sXmlFile] = array( 'sXmlFile' => $sXmlFile, ); From b065d1337427007380495619185a12181af27846 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 27 Oct 2020 09:46:03 +0100 Subject: [PATCH 02/13] Integration tests : add itop-community group --- test/integration/iTopModulesPhpVersionChecklistTest.php | 1 + test/integration/iTopModulesXmlVersionChecklistTest.php | 1 + 2 files changed, 2 insertions(+) diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php index 24695aa1f..77907ec54 100644 --- a/test/integration/iTopModulesPhpVersionChecklistTest.php +++ b/test/integration/iTopModulesPhpVersionChecklistTest.php @@ -24,6 +24,7 @@ use iTopDesignFormat; * @runTestsInSeparateProcesses * @preserveGlobalState disabled * @backupGlobals disabled + * @group itop-community * * @covers iTopDesignFormat * diff --git a/test/integration/iTopModulesXmlVersionChecklistTest.php b/test/integration/iTopModulesXmlVersionChecklistTest.php index 44bb2e5a8..194b7f193 100644 --- a/test/integration/iTopModulesXmlVersionChecklistTest.php +++ b/test/integration/iTopModulesXmlVersionChecklistTest.php @@ -25,6 +25,7 @@ use iTopDesignFormat; * @runTestsInSeparateProcesses * @preserveGlobalState disabled * @backupGlobals disabled + * @group itop-community * * @covers iTopDesignFormat * From ada7f307937581660edb1daff829f1f5e46b7f52 Mon Sep 17 00:00:00 2001 From: acognet Date: Tue, 27 Oct 2020 09:59:05 +0100 Subject: [PATCH 03/13] =?UTF-8?q?N=C2=B03139=20-=20import=20csv=20:=20hype?= =?UTF-8?q?rlink=20not=20clickable=20-=20replace=20htmlentities=20with=20u?= =?UTF-8?q?tils::HtmlEntities()=20to=20ensure=20that=20the=20same=20option?= =?UTF-8?q?s=20are=20used=20application=20wide.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/bulkchange.class.inc.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php index 7247067e5..976d894d5 100644 --- a/core/bulkchange.class.inc.php +++ b/core/bulkchange.class.inc.php @@ -309,7 +309,7 @@ class BulkChange $value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues); } $oReconFilter->AddCondition($sForeignAttCode, $value, '='); - $aResults[$iCol] = new CellStatus_Void(htmlentities($aRowData[$iCol])); + $aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol])); } $oExtObjects = new CMDBObjectSet($oReconFilter); @@ -396,7 +396,7 @@ class BulkChange } $aCacheKeys[] = $value; $oReconFilter->AddCondition($sForeignAttCode, $value, '='); - $aResults[$iCol] = new CellStatus_Void(htmlentities($aRowData[$iCol])); + $aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol])); } $sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query... $iForeignKey = null; @@ -466,7 +466,7 @@ class BulkChange foreach ($aKeyConfig as $sForeignAttCode => $iCol) { // Report the change on reconciliation values as well - $aResults[$iCol] = new CellStatus_Modify(htmlentities($aRowData[$iCol])); + $aResults[$iCol] = new CellStatus_Modify(utils::HtmlEntities($aRowData[$iCol])); } } } @@ -539,7 +539,7 @@ class BulkChange { if ($sAttCode == 'id') { - $aResults[$iCol]= new CellStatus_Void(htmlentities($aRowData[$iCol])); + $aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol])); } else { @@ -555,7 +555,7 @@ class BulkChange } if (isset($aErrors[$sAttCode])) { - $aResults[$iCol]= new CellStatus_Issue(htmlentities($aRowData[$iCol]), $sOrigValue, $aErrors[$sAttCode]); + $aResults[$iCol]= new CellStatus_Issue(utils::HtmlEntities($aRowData[$iCol]), $sOrigValue, $aErrors[$sAttCode]); } elseif (array_key_exists($sAttCode, $aChangedFields)) { @@ -578,7 +578,7 @@ class BulkChange } else { - $aResults[$iCol]= new CellStatus_Void(htmlentities($aRowData[$iCol])); + $aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol])); } } } @@ -925,7 +925,7 @@ class BulkChange { // Leave the cell unchanged $aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat')); - $aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, htmlentities($this->m_aData[$iRow][$iCol]), Dict::S('UI:CSVReport-Row-Issue-DateFormat')); + $aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, utils::HtmlEntities($this->m_aData[$iRow][$iCol]), Dict::S('UI:CSVReport-Row-Issue-DateFormat')); } } } @@ -1083,7 +1083,7 @@ class BulkChange { if (!array_key_exists($iCol, $aResult[$iRow])) { - $aResult[$iRow][$iCol] = new CellStatus_Void(htmlentities($aRowData[$iCol])); + $aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol])); } } foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts) @@ -1097,7 +1097,7 @@ class BulkChange if (!array_key_exists($iCol, $aResult[$iRow])) { // The foreign attribute is one of our reconciliation key - $aResult[$iRow][$iCol] = new CellStatus_Void(htmlentities($aRowData[$iCol])); + $aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol])); } } } From 97d322a0594abfd85aab946171693fafdd081aab Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 27 Oct 2020 15:17:17 +0100 Subject: [PATCH 04/13] =?UTF-8?q?:memo:=20N=C2=B03218=20Add=20some=20PHPDo?= =?UTF-8?q?c=20on=20current=20change=20set/get?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/cmdbobject.class.inc.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index 0e9dea6fa..ce8acf0d6 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -102,8 +102,12 @@ abstract class CMDBObject extends DBObject * @see SetTrackInfo if CurrentChange is null, then a new one will be create using trackinfo * * @param CMDBChange|null $oChange use null so that the API will recreate a new CMDBChange using TrackInfo & TrackOrigin + * If providing a CMDBChange, you should persist it first ! Indeed the API will automatically create CMDBChangeOp (see + * \CMDBObject::RecordObjCreation / RecordAttChange / RecordObjDeletion for example) and link them to the current change : in + * consequence this CMDBChange must have a key set ! * * @since 2.7.2 N°3219 can now reset CMDBChange by passing null + * @since 2.7.2 N°3218 PHPDoc about persisting the $oChange parameter first */ public static function SetCurrentChange($oChange) { @@ -118,7 +122,11 @@ abstract class CMDBObject extends DBObject // GetCurrentChange to create a default change if not already done in the current context // /** - * Get a change record (create it if not existing) + * @param bool $bAutoCreate if true calls {@link CreateChange} to get a new persisted object + * + * @return \CMDBChange + * + * @uses CreateChange */ public static function GetCurrentChange($bAutoCreate = true) { @@ -189,10 +197,12 @@ abstract class CMDBObject extends DBObject return self::$m_sOrigin; } } - + /** - * Create a standard change record (done here 99% of the time, and nearly once per page) - */ + * Set to {@link $m_oCurrChange} a standard change record (done here 99% of the time, and nearly once per page) + * + * The CMDBChange is persisted so that it has a key > 0, and any new CMDBChangeOp can link to it + */ protected static function CreateChange() { self::$m_oCurrChange = MetaModel::NewObject("CMDBChange"); From f257dcfb8593ac7a669cd4cd838309ca7ef2156a Mon Sep 17 00:00:00 2001 From: BenGrenoble Date: Wed, 28 Oct 2020 08:48:46 +0100 Subject: [PATCH 05/13] ConfigManagementCI and CI+ in structure dict --- .../dictionaries/cs.dict.itop-config-mgmt.php | 2 -- .../dictionaries/da.dict.itop-config-mgmt.php | 2 -- .../dictionaries/de.dict.itop-config-mgmt.php | 2 -- .../dictionaries/en.dict.itop-config-mgmt.php | 2 -- .../dictionaries/es_cr.dict.itop-config-mgmt.php | 2 -- .../dictionaries/fr.dict.itop-config-mgmt.php | 2 -- .../dictionaries/hu.dict.itop-config-mgmt.php | 2 -- .../dictionaries/it.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/ja.dict.itop-config-mgmt.php | 2 -- .../dictionaries/nl.dict.itop-config-mgmt.php | 2 -- .../dictionaries/pt_br.dict.itop-config-mgmt.php | 2 -- .../dictionaries/ru.dict.itop-config-mgmt.php | 2 -- .../dictionaries/sk.dict.itop-config-mgmt.php | 2 -- .../dictionaries/tr.dict.itop-config-mgmt.php | 2 -- .../dictionaries/zh_cn.dict.itop-config-mgmt.php | 2 -- datamodels/2.x/itop-structure/cs.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/da.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/de.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/en.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/fr.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/hu.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/it.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/ja.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/nl.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/ru.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/sk.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/tr.dict.itop-structure.php | 2 ++ datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php | 2 ++ 30 files changed, 30 insertions(+), 32 deletions(-) diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php index a0946bc93..4c5a21e3b 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php @@ -1540,8 +1540,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Menu:Application+' => 'Všechny aplikace', 'Menu:DBServer' => 'Databázové servery', 'Menu:DBServer+' => 'Databázové servery', - 'Menu:ConfigManagementCI' => 'Konfigurační položky', - 'Menu:ConfigManagementCI+' => 'Konfigurační položky', 'Menu:BusinessProcess' => 'Obchodní procesy', 'Menu:BusinessProcess+' => 'Všechny obchodní procesy', 'Menu:ApplicationSolution' => 'Aplikační řešení', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php index 427970038..751b3dd0d 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php @@ -1536,8 +1536,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Menu:Application+' => 'Alle Anvendelser', 'Menu:DBServer' => 'Database server', 'Menu:DBServer+' => 'Database server', - 'Menu:ConfigManagementCI' => 'Configuration Items', - 'Menu:ConfigManagementCI+' => 'Configuration Items', 'Menu:BusinessProcess' => 'Forretnings proces', 'Menu:BusinessProcess+' => 'Alle forretnings processer', 'Menu:ApplicationSolution' => 'Applikations løsning', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php index 6f2484a47..7ad13bd88 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php @@ -1539,8 +1539,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Menu:Application+' => 'Alle Anwendungen', 'Menu:DBServer' => 'Datenbank-Server', 'Menu:DBServer+' => 'Datenbank-Server', - 'Menu:ConfigManagementCI' => 'Configuration Items', - 'Menu:ConfigManagementCI+' => 'Configuration Items', 'Menu:BusinessProcess' => 'Business-Prozesse', 'Menu:BusinessProcess+' => 'Alle Business-Prozesse', 'Menu:ApplicationSolution' => 'Anwendungslösungen', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php index 6881afec2..d1df58137 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php @@ -1542,8 +1542,6 @@ Dict::Add('EN US', 'English', 'English', array( 'Menu:Application+' => 'All applications', 'Menu:DBServer' => 'Database servers', 'Menu:DBServer+' => 'Database servers', - 'Menu:ConfigManagementCI' => 'Configuration items', - 'Menu:ConfigManagementCI+' => 'Configuration items', 'Menu:BusinessProcess' => 'Business processes', 'Menu:BusinessProcess+' => 'All business processes', 'Menu:ApplicationSolution' => 'Application solutions', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php index 922618be8..aa08975c3 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php @@ -1541,8 +1541,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Menu:Application+' => 'Aplicaciones/Programas', 'Menu:DBServer' => 'Servidores de Base de Datos', 'Menu:DBServer+' => 'Servidores de Base de Datos', - 'Menu:ConfigManagementCI' => 'Elementos de Configuración', - 'Menu:ConfigManagementCI+' => 'Elementos de Confirguración', 'Menu:BusinessProcess' => 'Proceso de Negocio', 'Menu:BusinessProcess+' => 'Proceso de Negocios', 'Menu:ApplicationSolution' => 'Solución Aplicativa', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php index 934ab8e17..c7c6a5655 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php @@ -1547,8 +1547,6 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Menu:Application+' => 'Tous les logiciels', 'Menu:DBServer' => 'Serveur de base de données', 'Menu:DBServer+' => '', - 'Menu:ConfigManagementCI' => 'CIs', - 'Menu:ConfigManagementCI+' => 'CIs', 'Menu:BusinessProcess' => 'Processus métier', 'Menu:BusinessProcess+' => 'Tous les processus métiers', 'Menu:ApplicationSolution' => 'Solutions applicatives', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php index 2e3c4d7d5..cf193b660 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php @@ -1533,8 +1533,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Menu:Application+' => '', 'Menu:DBServer' => 'Adatbázis szerverek', 'Menu:DBServer+' => '', - 'Menu:ConfigManagementCI' => 'Konfigurációs elemek (CI)', - 'Menu:ConfigManagementCI+' => '', 'Menu:BusinessProcess' => 'Üzleti folyamatok', 'Menu:BusinessProcess+' => '', 'Menu:ApplicationSolution' => 'Egyedi alkalmazások', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php index 2448f35ff..4ab46e4e0 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php @@ -1306,8 +1306,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Class:IPInterface+' => '~~', 'Class:IPInterface/Attribute:ipaddress' => 'IP address~~', 'Class:IPInterface/Attribute:ipaddress+' => '~~', - - 'Class:IPInterface/Attribute:macaddress' => 'MAC address~~', 'Class:IPInterface/Attribute:macaddress+' => '~~', 'Class:IPInterface/Attribute:comment' => 'Comment~~', @@ -1536,8 +1534,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Menu:Application+' => 'Tutte le applicazioni', 'Menu:DBServer' => 'Database Servers', 'Menu:DBServer+' => 'Database Servers', - 'Menu:ConfigManagementCI' => 'Elementi di Configurazione (CI)', - 'Menu:ConfigManagementCI+' => 'Elementi di Configurazione (CI)', 'Menu:BusinessProcess' => 'Processi di business', 'Menu:BusinessProcess+' => 'Tutti i processi di business', 'Menu:ApplicationSolution' => 'Soluzioni applicative', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php index 21c13f464..01e8df73a 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php @@ -1536,8 +1536,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Menu:Application+' => '全アプリケーション', 'Menu:DBServer' => 'DBサーバ', 'Menu:DBServer+' => 'DBサーバ', - 'Menu:ConfigManagementCI' => '構成管理項目', - 'Menu:ConfigManagementCI+' => '構成管理項目', 'Menu:BusinessProcess' => 'ビジネスプロセス', 'Menu:BusinessProcess+' => '全ビジネスプロセス', 'Menu:ApplicationSolution' => 'アプリケーションソリューション', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php index 2872461e9..2ac5642aa 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php @@ -1548,8 +1548,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Menu:Application+' => 'Alle applicaties', 'Menu:DBServer' => 'Databaseservers', 'Menu:DBServer+' => 'Databaseservers', - 'Menu:ConfigManagementCI' => 'Configuratie-items', - 'Menu:ConfigManagementCI+' => 'Configuratie-items', 'Menu:BusinessProcess' => 'Bedrijfsprocessen', 'Menu:BusinessProcess+' => 'Alle bedrijfsprocessen', 'Menu:ApplicationSolution' => 'Applicatie-oplossing', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php index 265939d00..2a76e5e4e 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php @@ -1541,8 +1541,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Menu:Application+' => 'Todas aplicações', 'Menu:DBServer' => 'Serviços Banco de Dados', 'Menu:DBServer+' => 'Serviços Banco de Dados', - 'Menu:ConfigManagementCI' => 'Itens de configuração', - 'Menu:ConfigManagementCI+' => 'Itens de configuração', 'Menu:BusinessProcess' => 'Processos de negócios', 'Menu:BusinessProcess+' => 'Todos processos de negócios', 'Menu:ApplicationSolution' => 'Solução aplicação', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php index 4036c40d5..4ba9ec589 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php @@ -1526,8 +1526,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Menu:Application+' => 'Все приложения', 'Menu:DBServer' => 'Серверы баз данных', 'Menu:DBServer+' => 'Серверы баз данных', - 'Menu:ConfigManagementCI' => 'Конфигурационные единицы', - 'Menu:ConfigManagementCI+' => 'Конфигурационные единицы', 'Menu:BusinessProcess' => 'Бизнес-процессы', 'Menu:BusinessProcess+' => 'Все бизнес-процессы', 'Menu:ApplicationSolution' => 'Прикладные решения', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php index d9c72bfac..9ee588962 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php @@ -1540,8 +1540,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Menu:Application+' => '', 'Menu:DBServer' => 'Databázové servery', 'Menu:DBServer+' => '', - 'Menu:ConfigManagementCI' => 'Konfiguračné položky', - 'Menu:ConfigManagementCI+' => '', 'Menu:BusinessProcess' => 'Biznisové procesy', 'Menu:BusinessProcess+' => '', 'Menu:ApplicationSolution' => 'Aplikačné riešenia', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php index 80e924f6b..4bc87290a 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php @@ -1542,8 +1542,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Menu:Application+' => 'Tüm Uygulamalar', 'Menu:DBServer' => 'Veritabanı sunucuları', 'Menu:DBServer+' => 'Veritabanı sunucuları', - 'Menu:ConfigManagementCI' => 'Konfigürasyon Kalemleri', - 'Menu:ConfigManagementCI+' => 'Konfigürasyon Kalemleri', 'Menu:BusinessProcess' => 'İş süreçleri', 'Menu:BusinessProcess+' => 'Tüm İş süreçleri', 'Menu:ApplicationSolution' => 'Uygulama çözümleri', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php index 62cf53969..67257306f 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php @@ -1537,8 +1537,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Menu:Application+' => '所有应用', 'Menu:DBServer' => '数据库服务器', 'Menu:DBServer+' => '数据库服务器', - 'Menu:ConfigManagementCI' => '配置项', - 'Menu:ConfigManagementCI+' => '配置项', 'Menu:BusinessProcess' => '业务流程', 'Menu:BusinessProcess+' => '所有业务流程', 'Menu:ApplicationSolution' => '应用方案', diff --git a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php index 38bf8b3f4..6c288521a 100644 --- a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php @@ -330,6 +330,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Menu:Organization+' => 'Všechny organizace', 'Menu:ConfigManagement' => 'Správa konfigurací', 'Menu:ConfigManagement+' => 'Správa konfigurací', + 'Menu:ConfigManagementCI' => 'Konfigurační položky', + 'Menu:ConfigManagementCI+' => 'Konfigurační položky', 'Menu:ConfigManagementOverview' => 'Přehled', 'Menu:ConfigManagementOverview+' => 'Přehled', 'Menu:Contact' => 'Kontakty', diff --git a/datamodels/2.x/itop-structure/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/da.dict.itop-structure.php index a4f4e045a..93abf8a6d 100644 --- a/datamodels/2.x/itop-structure/da.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/da.dict.itop-structure.php @@ -318,6 +318,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Menu:Organization+' => 'Alle Organisationer', 'Menu:ConfigManagement' => 'Configuration Management', 'Menu:ConfigManagement+' => 'Configuration Management', + 'Menu:ConfigManagementCI' => 'Configuration Items', + 'Menu:ConfigManagementCI+' => 'Configuration Items', 'Menu:ConfigManagementOverview' => 'Oversigt', 'Menu:ConfigManagementOverview+' => 'Oversigt', 'Menu:Contact' => 'Kontakt', diff --git a/datamodels/2.x/itop-structure/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/de.dict.itop-structure.php index 0f3051340..b5ae2121a 100644 --- a/datamodels/2.x/itop-structure/de.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/de.dict.itop-structure.php @@ -329,6 +329,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Menu:Organization+' => 'Alle Organisationen', 'Menu:ConfigManagement' => 'Configuration Management', 'Menu:ConfigManagement+' => 'Configuration Management', + 'Menu:ConfigManagementCI' => 'Configuration Items', + 'Menu:ConfigManagementCI+' => 'Configuration Items', 'Menu:ConfigManagementOverview' => 'Übersicht', 'Menu:ConfigManagementOverview+' => 'Übersicht', 'Menu:Contact' => 'Kontakte', diff --git a/datamodels/2.x/itop-structure/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/en.dict.itop-structure.php index 70db940f2..2200c9448 100644 --- a/datamodels/2.x/itop-structure/en.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/en.dict.itop-structure.php @@ -352,6 +352,8 @@ Dict::Add('EN US', 'English', 'English', array( 'Menu:Organization+' => 'All organizations', 'Menu:ConfigManagement' => 'Configuration Management', 'Menu:ConfigManagement+' => 'Configuration Management', + 'Menu:ConfigManagementCI' => 'Configuration items', + 'Menu:ConfigManagementCI+' => 'Configuration items', 'Menu:ConfigManagementOverview' => 'Overview', 'Menu:ConfigManagementOverview+' => 'Overview', 'Menu:Contact' => 'Contacts', diff --git a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php index 5e3b60d6c..52d212b89 100644 --- a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php @@ -323,6 +323,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Menu:Organization+' => 'Organizaciones', 'Menu:ConfigManagement' => 'Administración de la Configuración', 'Menu:ConfigManagement+' => 'Administración de la Configuración', + 'Menu:ConfigManagementCI' => 'Elementos de Configuración', + 'Menu:ConfigManagementCI+' => 'Elementos de Confirguración', 'Menu:ConfigManagementOverview' => 'Resumen de Infraestructura', 'Menu:ConfigManagementOverview+' => 'Resumen de Infraestructura', 'Menu:Contact' => 'Contactos', diff --git a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php index a67010afa..d78e0b8d3 100644 --- a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php @@ -355,6 +355,8 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Menu:Organization+' => 'Toutes les organisations', 'Menu:ConfigManagement' => 'Gestion des configurations', 'Menu:ConfigManagement+' => 'Gestion des configurations', + 'Menu:ConfigManagementCI' => 'CIs', + 'Menu:ConfigManagementCI+' => 'CIs', 'Menu:ConfigManagementOverview' => 'Tableaux de bord', 'Menu:ConfigManagementOverview+' => 'Tableaux de bord', 'Menu:Contact' => 'Contacts', diff --git a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php index f19bed7d4..02d3e46ea 100644 --- a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php @@ -321,6 +321,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Menu:Organization+' => '', 'Menu:ConfigManagement' => 'Konfiguráció menedzsment', 'Menu:ConfigManagement+' => '', + 'Menu:ConfigManagementCI' => 'Konfigurációs elemek (CI)', + 'Menu:ConfigManagementCI+' => '', 'Menu:ConfigManagementOverview' => 'Áttekintő', 'Menu:ConfigManagementOverview+' => '', 'Menu:Contact' => 'Kapcsolattartók', diff --git a/datamodels/2.x/itop-structure/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/it.dict.itop-structure.php index 2ea205c8f..e789c251d 100644 --- a/datamodels/2.x/itop-structure/it.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/it.dict.itop-structure.php @@ -320,6 +320,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Menu:Organization+' => 'Tutte le organizzazioni', 'Menu:ConfigManagement' => 'Gestione delle Configurazioni', 'Menu:ConfigManagement+' => 'Gestione delle Configurazioni', + 'Menu:ConfigManagementCI' => 'Elementi di Configurazione (CI)', + 'Menu:ConfigManagementCI+' => 'Elementi di Configurazione (CI)', 'Menu:ConfigManagementOverview' => 'Panoramica', 'Menu:ConfigManagementOverview+' => 'Panoramica', 'Menu:Contact' => 'Contatti', diff --git a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php index b36f971dd..f041bed7c 100644 --- a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php @@ -321,6 +321,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Menu:Organization+' => '全組織', 'Menu:ConfigManagement' => '構成管理', 'Menu:ConfigManagement+' => '構成管理', + 'Menu:ConfigManagementCI' => '構成管理項目', + 'Menu:ConfigManagementCI+' => '構成管理項目', 'Menu:ConfigManagementOverview' => '概要', 'Menu:ConfigManagementOverview+' => '概要', 'Menu:Contact' => '連絡先', diff --git a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php index 7604691ff..b7dc93108 100644 --- a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php @@ -326,6 +326,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Menu:Organization+' => 'Alle organisaties', 'Menu:ConfigManagement' => 'Configuratiebeheer', 'Menu:ConfigManagement+' => 'Configuratiebeheer', + 'Menu:ConfigManagementCI' => 'Configuratie-items', + 'Menu:ConfigManagementCI+' => 'Configuratie-items', 'Menu:ConfigManagementOverview' => 'Overzicht', 'Menu:ConfigManagementOverview+' => 'Overzicht', 'Menu:Contact' => 'Contacten', diff --git a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php index 763b8ab90..49a2e4267 100644 --- a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php @@ -320,6 +320,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Menu:Organization+' => 'Todas organizações', 'Menu:ConfigManagement' => 'Gerenciamento Configurações', 'Menu:ConfigManagement+' => 'Gerenciamento Configurações', + 'Menu:ConfigManagementCI' => 'Itens de configuração', + 'Menu:ConfigManagementCI+' => 'Itens de configuração', 'Menu:ConfigManagementOverview' => 'Visão geral', 'Menu:ConfigManagementOverview+' => 'Visão geral', 'Menu:Contact' => 'Contatos', diff --git a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php index 4df99bded..b05fcb0bf 100644 --- a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php @@ -306,6 +306,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Menu:Organization+' => 'Все организации', 'Menu:ConfigManagement' => 'Управление конфигурациями', 'Menu:ConfigManagement+' => 'Управление конфигурациями', + 'Menu:ConfigManagementCI' => 'Конфигурационные единицы', + 'Menu:ConfigManagementCI+' => 'Конфигурационные единицы', 'Menu:ConfigManagementOverview' => 'Обзор', 'Menu:ConfigManagementOverview+' => 'Обзор', 'Menu:Contact' => 'Контакты', diff --git a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php index 13b9ac83f..f77535472 100644 --- a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php @@ -319,6 +319,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Menu:Organization+' => '', 'Menu:ConfigManagement' => 'Manažment konfigurácie', 'Menu:ConfigManagement+' => '', + 'Menu:ConfigManagementCI' => 'Konfiguračné položky', + 'Menu:ConfigManagementCI+' => '', 'Menu:ConfigManagementOverview' => 'Prehľad', 'Menu:ConfigManagementOverview+' => '', 'Menu:Contact' => 'Kontakty', diff --git a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php index 4f9843630..c4e7ab530 100644 --- a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php @@ -321,6 +321,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Menu:Organization+' => 'Tüm Kurumlar', 'Menu:ConfigManagement' => 'Konfigürasyon Yönetimi', 'Menu:ConfigManagement+' => 'Konfigürasyon Yönetimi', + 'Menu:ConfigManagementCI' => 'Konfigürasyon Kalemleri', + 'Menu:ConfigManagementCI+' => 'Konfigürasyon Kalemleri', 'Menu:ConfigManagementOverview' => 'Özet', 'Menu:ConfigManagementOverview+' => 'Özet', 'Menu:Contact' => 'İrtibatlar', diff --git a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php index 9afd2f100..21feee406 100644 --- a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php @@ -319,6 +319,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Menu:Organization+' => '所有组织', 'Menu:ConfigManagement' => '配置管理', 'Menu:ConfigManagement+' => '配置管理', + 'Menu:ConfigManagementCI' => '配置项', + 'Menu:ConfigManagementCI+' => '配置项', 'Menu:ConfigManagementOverview' => '概览', 'Menu:ConfigManagementOverview+' => '概览', 'Menu:Contact' => '联系人', From 93132dc3b490d7a4a80671ca838c6e68b29718f7 Mon Sep 17 00:00:00 2001 From: BenGrenoble Date: Wed, 28 Oct 2020 08:49:05 +0100 Subject: [PATCH 06/13] Person_list in location --- .../itop-structure/datamodel.itop-structure.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index 4fe058c53..199c49f04 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -241,7 +241,14 @@ true - + + Person + location_id + add_only + 0 + 0 + +
@@ -1820,4 +1827,10 @@ + + + + + + \ No newline at end of file From 6583c9495a6af84f2a54d96f0ea57c65736d75ec Mon Sep 17 00:00:00 2001 From: BenGrenoble Date: Wed, 28 Oct 2020 09:17:58 +0100 Subject: [PATCH 07/13] Translation Fieldset person --- .../dictionaries/cs.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/da.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/de.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/en.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/es_cr.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/fr.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/hu.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/it.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/ja.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/nl.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/pt_br.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/ru.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/sk.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/tr.dict.itop-config-mgmt.php | 4 ---- .../dictionaries/zh_cn.dict.itop-config-mgmt.php | 4 ---- .../2.x/itop-structure/cs.dict.itop-structure.php | 8 ++++++++ .../2.x/itop-structure/da.dict.itop-structure.php | 10 ++++++++++ .../2.x/itop-structure/de.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/en.dict.itop-structure.php | 8 ++++++++ .../2.x/itop-structure/es_cr.dict.itop-structure.php | 10 ++++++++++ .../2.x/itop-structure/fr.dict.itop-structure.php | 8 ++++++++ .../2.x/itop-structure/hu.dict.itop-structure.php | 12 ++++++++++++ .../2.x/itop-structure/it.dict.itop-structure.php | 12 ++++++++++++ .../2.x/itop-structure/ja.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/nl.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/pt_br.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/ru.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/sk.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/tr.dict.itop-structure.php | 11 +++++++++++ .../2.x/itop-structure/zh_cn.dict.itop-structure.php | 11 +++++++++++ 30 files changed, 156 insertions(+), 60 deletions(-) diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php index 4c5a21e3b..d10438993 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php @@ -1519,10 +1519,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Server:moreinfo' => 'Více informací', 'Server:otherinfo' => 'Další informace', 'Server:power' => 'Napájení', - 'Person:info' => 'Obecné informace', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => 'Upozornění', 'Class:Subnet/Tab:IPUsage' => 'Využití IP', 'Class:Subnet/Tab:IPUsage-explain' => 'Rozhraní, která mají IP adresu v rozsahu: %1$s-%2$s', 'Class:Subnet/Tab:FreeIPs' => 'Volné IP adresy', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php index 751b3dd0d..9d2671fc7 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php @@ -1515,10 +1515,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'Server:moreinfo' => 'Yderligere Information', 'Server:otherinfo' => 'Øvrig Information', 'Server:power' => 'Power supply~~', - 'Person:info' => 'Almindelig Information', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => 'Underretning', 'Class:Subnet/Tab:IPUsage' => 'IP Brug', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces der har en IP i området: %1$s til %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Ledige IP', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php index 7ad13bd88..f74c0c361 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php @@ -1518,10 +1518,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Server:moreinfo' => 'Weitere Informationen', 'Server:otherinfo' => 'Sonstige Informationen', 'Server:power' => 'Stromversorgung', - 'Person:info' => 'Allgemeine Informationen', - 'UserLocal:info' => 'Allgemeine Informationen', - 'Person:personal_info' => 'Persönliche Informationen', - 'Person:notifiy' => 'Benachrichtigungen', 'Class:Subnet/Tab:IPUsage' => 'IP-Nutzung', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces mit einer IP in der Range: %1$s bis %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Freie IPs', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php index d1df58137..b383bb4e1 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php @@ -1503,10 +1503,6 @@ Dict::Add('EN US', 'English', 'English', array( 'Server:moreinfo' => 'More information', 'Server:otherinfo' => 'Other information', 'Server:power' => 'Power supply', - 'Person:info' => 'General information', - 'UserLocal:info' => 'General information', - 'Person:personal_info' => 'Personal information', - 'Person:notifiy' => 'Notification', 'Class:Subnet/Tab:IPUsage' => 'IP Usage', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: %1$s to %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Free IPs', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php index aa08975c3..d78468718 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php @@ -1520,10 +1520,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( 'Server:moreinfo' => 'Más Información', 'Server:otherinfo' => 'Otra Información', 'Server:power' => 'Fuente de Poder', - 'Person:info' => 'Información General', - 'UserLocal:info' => 'Información General', - 'Person:personal_info' => 'Información Personal', - 'Person:notifiy' => 'Notificación', 'Class:Subnet/Tab:IPUsage' => 'Uso de IP', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfases con IP en el rango: %1$s a %2$s', 'Class:Subnet/Tab:FreeIPs' => 'IPs Libres', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php index c7c6a5655..3117341e0 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php @@ -1454,10 +1454,6 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Server:moreinfo' => 'Informations complémentaires', 'Server:otherinfo' => 'Autres informations', 'Server:power' => 'Alimentation électrique', - 'Person:info' => 'Informations générales', - 'UserLocal:info' => 'Informations générales', - 'Person:personal_info' => 'Informations personnelles', - 'Person:notifiy' => 'Notification', 'Class:Subnet/Tab:IPUsage' => 'IP utilisées', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces ayant une IP dans la plage: %1$s à %2$s', 'Class:Subnet/Tab:FreeIPs' => 'IP disponibles', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php index cf193b660..a657719ad 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php @@ -1512,10 +1512,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'Server:moreinfo' => 'More information~~', 'Server:otherinfo' => 'Other information~~', 'Server:power' => 'Power supply~~', - 'Person:info' => 'General information~~', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => 'Notification~~', 'Class:Subnet/Tab:IPUsage' => 'IP felhasználás', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfészek a következő tartományba esnek: %1$s - %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Szabad IP-k', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php index 4ab46e4e0..215dbae5f 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php @@ -1513,10 +1513,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Server:moreinfo' => 'More information~~', 'Server:otherinfo' => 'Other information~~', 'Server:power' => 'Power supply~~', - 'Person:info' => 'General information~~', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => 'Notification~~', 'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP', 'Class:Subnet/Tab:IPUsage-explain' => 'Iterfacce che hanno un IP nell\'intervallo: %1$s e %2$s', 'Class:Subnet/Tab:FreeIPs' => 'IP liberi', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php index 01e8df73a..661087265 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php @@ -1515,10 +1515,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Server:moreinfo' => '追加情報', 'Server:otherinfo' => '他の情報', 'Server:power' => 'Power supply~~', - 'Person:info' => '情報', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => '通知', 'Class:Subnet/Tab:IPUsage' => 'IP 利用', 'Class:Subnet/Tab:IPUsage-explain' => 'インターフェースは、レンジ: %1$s から %2$sの中のIPを持っています。', 'Class:Subnet/Tab:FreeIPs' => 'フリーなIP', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php index 2ac5642aa..495b8219a 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php @@ -1527,10 +1527,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Server:moreinfo' => 'Meer informatie', 'Server:otherinfo' => 'Andere informatie', 'Server:power' => 'Stroomtoevoer', - 'Person:info' => 'Globale informatie', - 'UserLocal:info' => 'Globale informatie', - 'Person:personal_info' => 'Persoonlijke informatie', - 'Person:notifiy' => 'Notificeer', 'Class:Subnet/Tab:IPUsage' => 'IP-gebruik', 'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces met een IP-adres in de reeks: %1$s tot en met %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Beschikbare IP-adressen', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php index 2a76e5e4e..0414ad1eb 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php @@ -1520,10 +1520,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Server:moreinfo' => 'Mais informações', 'Server:otherinfo' => 'Outras informações', 'Server:power' => 'Fonte de alimentação', - 'Person:info' => 'Informações gerais', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Informação pessoal', - 'Person:notifiy' => 'Notificação', 'Class:Subnet/Tab:IPUsage' => 'IP usado', 'Class:Subnet/Tab:IPUsage-explain' => 'Placas de rede contendo IP na faixa: %1$s para %2$s', 'Class:Subnet/Tab:FreeIPs' => 'IPs livres', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php index 4ba9ec589..2769849f2 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php @@ -1505,10 +1505,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Server:moreinfo' => 'Спецификация', 'Server:otherinfo' => 'Дополнительно', 'Server:power' => 'Электропитание', - 'Person:info' => 'Основная информация', - 'UserLocal:info' => 'Основная информация', - 'Person:personal_info' => 'Личная информация', - 'Person:notifiy' => 'Уведомления', 'Class:Subnet/Tab:IPUsage' => 'Использование IP-адресов', 'Class:Subnet/Tab:IPUsage-explain' => 'Интерфейсы с IP-адресом в диапазоне: %1$s - %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Свободные IP-адреса', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php index 9ee588962..5ef412680 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php @@ -1519,10 +1519,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Server:moreinfo' => 'Viac informácií', 'Server:otherinfo' => 'Iné informácie', 'Server:power' => 'Power supply~~', - 'Person:info' => 'Všeobecné informácie', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => 'Upozornenie', 'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries', 'Class:Subnet/Tab:IPUsage-explain' => 'Rozhrania majúce IP adresu v rozsahu: %1$s do %2$s', 'Class:Subnet/Tab:FreeIPs' => 'Voľné IP adresy', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php index 4bc87290a..7015eb8e5 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php @@ -1521,10 +1521,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'Server:moreinfo' => 'More information~~', 'Server:otherinfo' => 'Other information~~', 'Server:power' => 'Power supply~~', - 'Person:info' => 'General information~~', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => 'Personal information~~', - 'Person:notifiy' => 'Notification~~', 'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı', 'Class:Subnet/Tab:IPUsage-explain' => '%1$s - %2$s aralığındaki IPye sahip arayüzler', 'Class:Subnet/Tab:FreeIPs' => 'Boş IPler', diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php index 67257306f..e457952b9 100644 --- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php @@ -1520,10 +1520,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Server:moreinfo' => '更多信息', 'Server:otherinfo' => '其它信息', 'Server:power' => '电力供应', - 'Person:info' => '基本信息', - 'UserLocal:info' => 'General information~~', - 'Person:personal_info' => '个人信息', - 'Person:notifiy' => '通知', 'Class:Subnet/Tab:IPUsage' => 'IP 使用率', 'Class:Subnet/Tab:IPUsage-explain' => '网卡IP范围: %1$s 到 %2$s', 'Class:Subnet/Tab:FreeIPs' => '空闲 IP', diff --git a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php index 6c288521a..8cb69e2f8 100644 --- a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php @@ -357,4 +357,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Menu:ConfigManagement:Typology' => 'Konfigurace typologie', )); +// Add translation for Fieldsets + +Dict::Add('CS CZ', 'Czech', 'Čeština', array( + 'Person:info' => 'Obecné informace', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => 'Upozornění', +)); ?> \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/da.dict.itop-structure.php index 93abf8a6d..3fda2150f 100644 --- a/datamodels/2.x/itop-structure/da.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/da.dict.itop-structure.php @@ -344,4 +344,14 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'UI_WelcomeMenu_AllConfigItems' => 'Sammenfatning', 'Menu:ConfigManagement:Typology' => 'Typologi Konfiguration', )); + +// Add translation for Fieldsets + +Dict::Add('DA DA', 'Danish', 'Dansk', array( + 'Person:info' => 'Almindelig Information', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => 'Underretning', +)); + ?> \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/de.dict.itop-structure.php index b5ae2121a..b3c634c71 100644 --- a/datamodels/2.x/itop-structure/de.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/de.dict.itop-structure.php @@ -356,4 +356,15 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration', )); +// +// Add translation for Fieldsets +// + +Dict::Add('DE DE', 'German', 'Deutsch', array( + 'Person:info' => 'Allgemeine Informationen', + 'UserLocal:info' => 'Allgemeine Informationen', + 'Person:personal_info' => 'Persönliche Informationen', + 'Person:notifiy' => 'Benachrichtigungen', +)); + ?> \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/en.dict.itop-structure.php index 2200c9448..bb7e62797 100644 --- a/datamodels/2.x/itop-structure/en.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/en.dict.itop-structure.php @@ -379,3 +379,11 @@ Dict::Add('EN US', 'English', 'English', array( 'Menu:ConfigManagement:Typology' => 'Typology configuration', )); +// Add translation for Fieldsets + +Dict::Add('EN US', 'English', 'English', array( + 'Person:info' => 'General information', + 'UserLocal:info' => 'General information', + 'Person:personal_info' => 'Personal information', + 'Person:notifiy' => 'Notification', +)); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php index 52d212b89..c82477ca1 100644 --- a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php @@ -351,3 +351,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( )); +// +// Add translation for Fieldsets +// + +Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array( + 'Person:info' => 'Información General', + 'UserLocal:info' => 'Información General', + 'Person:personal_info' => 'Información Personal', + 'Person:notifiy' => 'Notificación', +)); diff --git a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php index d78e0b8d3..326b2469b 100644 --- a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php @@ -382,3 +382,11 @@ Dict::Add('FR FR', 'French', 'Français', array( 'Menu:ConfigManagement:Typology' => 'Configuration des typologies', )); +// Add translation for Fieldsets + +Dict::Add('FR FR', 'French', 'Français', array( + 'Person:info' => 'Informations générales', + 'UserLocal:info' => 'Informations générales', + 'Person:personal_info' => 'Informations personnelles', + 'Person:notifiy' => 'Notification', +)); diff --git a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php index 02d3e46ea..5c9151984 100644 --- a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php @@ -347,4 +347,16 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'UI_WelcomeMenu_AllConfigItems' => 'Summary~~', 'Menu:ConfigManagement:Typology' => 'Typology configuration~~', )); + +// +// Add translation for Fieldsets +// + +Dict::Add('HU HU', 'Hungarian', 'Magyar', array( + 'Person:info' => 'General information~~', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => 'Notification~~', +)); + ?> \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/it.dict.itop-structure.php index e789c251d..eff5ee4b6 100644 --- a/datamodels/2.x/itop-structure/it.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/it.dict.itop-structure.php @@ -345,4 +345,16 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Menu:Typology+' => 'Typology configuration~~', 'UI_WelcomeMenu_AllConfigItems' => 'Summary~~', 'Menu:ConfigManagement:Typology' => 'Typology configuration~~', +)); + + +// +// Add translation for Fieldsets +// + +Dict::Add('IT IT', 'Italian', 'Italiano', array( + 'Person:info' => 'General information~~', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => 'Notification~~', )); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php index f041bed7c..dd50df0f6 100644 --- a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php @@ -346,4 +346,15 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Menu:Typology+' => 'トポロジー構成', 'UI_WelcomeMenu_AllConfigItems' => 'サマリー', 'Menu:ConfigManagement:Typology' => '分類構成', +)); + +// +// Add translation for Fieldsets +// + +Dict::Add('JA JP', 'Japanese', '日本語', array( + 'Person:info' => '情報', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => '通知', )); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php index b7dc93108..4e6ea743a 100644 --- a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php @@ -352,3 +352,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'UI_WelcomeMenu_AllConfigItems' => 'Samenvatting', 'Menu:ConfigManagement:Typology' => 'Configuratie typologie', )); + +// +// Add translation for Fieldsets +// + +Dict::Add('NL NL', 'Dutch', 'Nederlands', array( + 'Person:info' => 'Globale informatie', + 'UserLocal:info' => 'Globale informatie', + 'Person:personal_info' => 'Persoonlijke informatie', + 'Person:notifiy' => 'Notificeer', +)); diff --git a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php index 49a2e4267..5b0904a36 100644 --- a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php @@ -345,4 +345,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Menu:Typology+' => 'Configuração tipologia', 'UI_WelcomeMenu_AllConfigItems' => 'Índice', 'Menu:ConfigManagement:Typology' => 'Configuração tipologia', +)); + +// +// Add translation for Fieldsets +// + +Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( + 'Person:info' => 'Informações gerais', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Informação pessoal', + 'Person:notifiy' => 'Notificação', )); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php index b05fcb0bf..46c94f44d 100644 --- a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php @@ -331,4 +331,15 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Menu:Typology+' => 'Типология', 'UI_WelcomeMenu_AllConfigItems' => 'Все конфигурационные единицы', 'Menu:ConfigManagement:Typology' => 'Настройка типологии', +)); + +// +// Add translation for Fieldsets +// + +Dict::Add('RU RU', 'Russian', 'Русский', array( + 'Person:info' => 'Основная информация', + 'UserLocal:info' => 'Основная информация', + 'Person:personal_info' => 'Личная информация', + 'Person:notifiy' => 'Уведомления', )); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php index f77535472..e25d51a78 100644 --- a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php @@ -344,4 +344,15 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'Menu:Typology+' => '', 'UI_WelcomeMenu_AllConfigItems' => 'Zhrnutie', 'Menu:ConfigManagement:Typology' => 'Konfiguračná typológia', +)); + +// +// Add translation for Fieldsets +// + +Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( + 'Person:info' => 'Všeobecné informácie', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => 'Upozornenie', )); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php index c4e7ab530..35a39332f 100644 --- a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php @@ -347,3 +347,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'UI_WelcomeMenu_AllConfigItems' => 'Summary~~', 'Menu:ConfigManagement:Typology' => 'Typology configuration~~', )); + +// +// Add translation for Fieldsets +// + +Dict::Add('TR TR', 'Turkish', 'Türkçe', array( + 'Person:info' => 'General information~~', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => 'Personal information~~', + 'Person:notifiy' => 'Notification~~', +)); \ No newline at end of file diff --git a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php index 21feee406..29219ffe0 100644 --- a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php @@ -344,4 +344,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Menu:Typology+' => '类型配置', 'UI_WelcomeMenu_AllConfigItems' => '摘要', 'Menu:ConfigManagement:Typology' => '类型配置', +)); + +// +// Add translation for Fieldsets +// + +Dict::Add('ZH CN', 'Chinese', '简体中文', array( + 'Person:info' => '基本信息', + 'UserLocal:info' => 'General information~~', + 'Person:personal_info' => '个人信息', + 'Person:notifiy' => '通知', )); \ No newline at end of file From dfd9dd3352a9529c50c49929159bf69f8f9dd7f1 Mon Sep 17 00:00:00 2001 From: BenGrenoble Date: Wed, 28 Oct 2020 10:01:55 +0100 Subject: [PATCH 08/13] Move cis_list from DocumentNote, DocumentWeb, DocumentFile to bridge cmdb ticket --- .../datamodel.itop-bridge-cmdb-ticket.xml | 33 +++++++++++++++++++ .../datamodel.itop-structure.xml | 9 ----- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml index 954603d76..4db0faf3c 100644 --- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml +++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml @@ -469,6 +469,39 @@
+ + +
+ + + 70 + + +
+ + + + +
+ + + 60 + + +
+ + + + +
+ + + 70 + + +
+ + diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index 199c49f04..e564ee5e7 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -1317,9 +1317,6 @@ 60 - - 70 - 80 @@ -1421,9 +1418,6 @@ 60 - - 70 - 80 @@ -1523,9 +1517,6 @@ 50 - - 60 - 70 From 6c5c71a0ee14a6fae619c5a9609351167bcbd060 Mon Sep 17 00:00:00 2001 From: BenGrenoble Date: Wed, 28 Oct 2020 14:08:00 +0100 Subject: [PATCH 09/13] Contracts_list/Services_list from structure to bridge cmdb ticket --- .../datamodel.itop-bridge-cmdb-ticket.xml | 18 ++++++++++++++++++ .../datamodel.itop-structure.xml | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml index 4db0faf3c..3badea312 100644 --- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml +++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml @@ -476,6 +476,12 @@ 70 + + 80 + + + 90 + @@ -487,6 +493,12 @@ 60 + + 70 + + + 80 + @@ -498,6 +510,12 @@ 70 + + 80 + + + 90 + diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index e564ee5e7..b9d262eb4 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -1317,12 +1317,6 @@ 60 - - 80 - - - 90 - @@ -1418,12 +1412,6 @@ 60 - - 80 - - - 90 - @@ -1517,12 +1505,6 @@ 50 - - 70 - - - 80 - From 906c8855b070777c5157203fc2d7fc422bd31c66 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 28 Oct 2020 18:32:49 +0100 Subject: [PATCH 10/13] :loud_sound: When error during CoreUpdate, show full file path instead of only basename --- .../2.x/itop-files-information/src/Service/FilesIntegrity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php b/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php index 66c8163cf..04e2e6fa7 100644 --- a/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php +++ b/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php @@ -103,7 +103,7 @@ class FilesIntegrity $sChecksum = md5($sContent); if (($iSize != $aFileInfo['size']) || ($sChecksum != $aFileInfo['md5'])) { - throw new FileIntegrityException(Dict::Format('FilesInformation:Error:CorruptedFile', basename($sFile))); + throw new FileIntegrityException(Dict::Format('FilesInformation:Error:CorruptedFile', $sFile)); } } // Packed with missing files... From 512b415bd66a27f0703e6ec61e53954607f904b2 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 30 Oct 2020 11:30:22 +0100 Subject: [PATCH 11/13] =?UTF-8?q?N=C2=B03065=20add=20test=20case=20in=20co?= =?UTF-8?q?mment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/core/CMDBSourceTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/core/CMDBSourceTest.php b/test/core/CMDBSourceTest.php index 010d825ce..db06932e1 100644 --- a/test/core/CMDBSourceTest.php +++ b/test/core/CMDBSourceTest.php @@ -102,10 +102,16 @@ class CMDBSourceTest extends ItopTestCase "enum('1','2','3') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '1'", ), 'ENUM with values containing parenthesis' => array( - true, + true, // see N°3065 : if having distinct values having parenthesis in enum values will cause comparison to be inexact "ENUM('CSP A','CSP M','NA','OEM(ROC)','OPEN(VL)','RETAIL (Boite)') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", "enum('CSP A','CSP M','NA','OEM(ROC)','OPEN(VL)','RETAIL (Boite)') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", ), +//FIXME N°3065 before the fix this returns true :( +// 'ENUM with different values, containing parenthesis' => array( +// false, +// "ENUM('value 1 (with parenthesis)','value 2') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", +// "enum('value 1 (with parenthesis)','value 3') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", +// ), ); } } From eebc29d2bbcae80ade912206a33ba498538f08d4 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 1 Sep 2020 17:17:01 +0200 Subject: [PATCH 12/13] =?UTF-8?q?N=C2=B03111=20-=20Fix=20Portal=20export?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d3b57c3bda70cc91a9ad2224b92fe6333830106c) --- composer.json | 3 +- core/metamodel.class.php | 2 +- .../portal/public/js/export.js | 4 +- lib/composer/autoload_classmap.php | 1 + lib/composer/autoload_static.php | 1 + pages/ajax.render.php | 120 ++---------------- sources/Controller/AjaxRenderController.php | 116 +++++++++++++++++ 7 files changed, 133 insertions(+), 114 deletions(-) create mode 100644 sources/Controller/AjaxRenderController.php diff --git a/composer.json b/composer.json index 8b9321e99..6a4bf3852 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,8 @@ "core", "application", "sources/application", - "sources/Composer" + "sources/Composer", + "sources/Controller" ], "exclude-from-classmap": [ "core/dbobjectsearch.class.php", diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 6bfc5fc90..7872cc6e7 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -4181,7 +4181,7 @@ abstract class MetaModel { $oSearch = DBObjectSearch::FromOQL("SELECT Contact WHERE id = :id"); $oSet = new DBObjectSet($oSearch, array(), array('id' => UserRights::GetContactId())); - $oSet->OptimizeColumnLoad($aCurrentContact); + $oSet->OptimizeColumnLoad(['Contact' => $aCurrentContact]); $oUser = $oSet->fetch(); foreach ($aCurrentContact as $sField) { diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/export.js b/datamodels/2.x/itop-portal-base/portal/public/js/export.js index 5334ac363..eadc664ad 100644 --- a/datamodels/2.x/itop-portal-base/portal/public/js/export.js +++ b/datamodels/2.x/itop-portal-base/portal/public/js/export.js @@ -18,7 +18,7 @@ function ExportStartExport() { var oParams = {}; - oParams.operation = 'export_build'; + oParams.operation = 'export_build_portal'; oParams.format = sFormat; oParams.token = sToken; oParams.start = 1; @@ -56,7 +56,7 @@ function ExportRun(data) { $('#export-close').show(); } else { - oParams.operation = 'export_build'; + oParams.operation = 'export_build_portal'; } $.post(GetAbsoluteUrlAppRoot() + 'pages/ajax.render.php', oParams, function (data) { diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 8f8e6b200..ec8c6b1ef 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -148,6 +148,7 @@ return array( 'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => $baseDir . '/sources/application/TwigBase/Twig/Extension.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => $baseDir . '/sources/application/TwigBase/Twig/TwigHelper.php', 'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php', + 'Combodo\\iTop\\Controller\\AjaxRenderController' => $baseDir . '/sources/Controller/AjaxRenderController.php', 'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php', 'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php', 'Combodo\\iTop\\TwigExtension' => $baseDir . '/application/twigextension.class.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 818c364ae..456be1c42 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -378,6 +378,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => __DIR__ . '/../..' . '/sources/application/TwigBase/Twig/Extension.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => __DIR__ . '/../..' . '/sources/application/TwigBase/Twig/TwigHelper.php', 'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php', + 'Combodo\\iTop\\Controller\\AjaxRenderController' => __DIR__ . '/../..' . '/sources/Controller/AjaxRenderController.php', 'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php', 'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php', 'Combodo\\iTop\\TwigExtension' => __DIR__ . '/../..' . '/application/twigextension.class.inc.php', diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 795c43d13..c50178a25 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -17,6 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ +use Combodo\iTop\Controller\AjaxRenderController; use Combodo\iTop\Renderer\Console\ConsoleFormRenderer; require_once('../approot.inc.php'); @@ -51,17 +52,17 @@ try // Only allow export functions to portal users switch ($operation) { - case 'export_build': + case 'export_build_portal': case 'export_cancel': case 'export_download': case 'cke_img_upload': case 'cke_upload_and_browse': case 'cke_browse': - $sRequestedPortalId = null; + $sRequestedPortalId = null; // Allowed for all users break; default: - $sRequestedPortalId = 'backoffice'; + $sRequestedPortalId = 'backoffice'; // Allowed only for console users break; } LoginWebPage::DoLoginEx($sRequestedPortalId, false); @@ -79,9 +80,10 @@ try // some operations are also used in the portal though switch ($operation) { - case 'export_build': + case 'export_build_portal': case 'export_download': // do nothing : used in portal (export.js in portal-base) + break; default: ContextTag::AddContext(ContextTag::TAG_CONSOLE); @@ -2444,113 +2446,11 @@ EOF break; case 'export_build': - register_shutdown_function(function () { - $aErr = error_get_last(); - if (($aErr !== null) && ($aErr['type'] & (E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR))) - { - ob_end_clean(); - echo json_encode(array('code' => 'error', 'percentage' => 100, 'message' => Dict::Format('UI:Error_Details', $aErr['message']))); - } - }); - try - { - $token = utils::ReadParam('token', null); - $sTokenForDisplay = utils::HtmlEntities($token); - $aResult = array( // Fallback error, just in case - 'code' => 'error', - 'percentage' => 100, - 'message' => "Export not found for token: '$sTokenForDisplay'", - ); - $data = ''; - if ($token === null) - { - if (!ContextTag::Check('backoffice')) - { - throw new Exception('Missing token'); - } - $sFormat = utils::ReadParam('format', ''); - $sExpression = utils::ReadParam('expression', null, false, 'raw_data'); - $iQueryId = utils::ReadParam('query', null); - if ($sExpression === null) - { - $oQuerySearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $iQueryId)); - $oQuerySearch->UpdateContextFromUser(); - $oQueries = new DBObjectSet($oQuerySearch); - if ($oQueries->Count() > 0) - { - $oQuery = $oQueries->Fetch(); - $sExpression = $oQuery->Get('oql'); - } - else - { - $aResult = array('code' => 'error', 'percentage' => 100, 'message' => "Invalid query phrasebook identifier: '$iQueryId'"); - } - } - if ($sExpression !== null) - { - $oSearch = DBObjectSearch::FromOQL($sExpression); - $oSearch->UpdateContextFromUser(); - $oExporter = BulkExport::FindExporter($sFormat, $oSearch); - $oExporter->SetObjectList($oSearch); - $oExporter->SetFormat($sFormat); - $oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE); - $oExporter->ReadParameters(); - } + AjaxRenderController::ExportBuild($oPage, false); + break; - // First pass, generate the headers - $data .= $oExporter->GetHeader(); - } - else - { - $oExporter = BulkExport::FindExporterFromToken($token); - if (utils::ReadParam('start', 0, false, 'integer') == 1) - { - // From portal, the first call is using a token - $data .= $oExporter->GetHeader(); - } - } - - if ($oExporter) - { - $data .= $oExporter->GetNextChunk($aResult); - if ($aResult['code'] != 'done') - { - $oExporter->AppendToTmpFile($data); - $aResult['token'] = $oExporter->SaveState(); - } - else - { - // Last pass - $data .= $oExporter->GetFooter(); - $oExporter->AppendToTmpFile($data); - $aResult['token'] = $oExporter->SaveState(); - if (substr($oExporter->GetMimeType(), 0, 5) == 'text/') - { - // Result must be encoded in UTF-8 to be passed as part of a JSON structure - $sCharset = $oExporter->GetCharacterSet(); - if (strtoupper($sCharset) != 'UTF-8') - { - $aResult['text_result'] = iconv($sCharset, 'UTF-8', file_get_contents($oExporter->GetTmpFilePath())); - } - else - { - $aResult['text_result'] = file_get_contents($oExporter->GetTmpFilePath()); - } - $aResult['mime_type'] = $oExporter->GetMimeType(); - } - $aResult['message'] = Dict::Format('Core:BulkExport:ClickHereToDownload_FileName', $oExporter->GetDownloadFileName()); - } - } - $oPage->add(json_encode($aResult)); - } catch (BulkExportException $e) - { - $aResult = array('code' => 'error', 'percentage' => 100, 'message' => utils::HtmlEntities($e->GetLocalizedMessage())); - $oPage->add(json_encode($aResult)); - } catch (Exception $e) - { - $aResult = array('code' => 'error', 'percentage' => 100, 'message' => utils::HtmlEntities($e->getMessage())); - $oPage->add(json_encode($aResult)); - } + case 'export_build_portal': + AjaxRenderController::ExportBuild($oPage, true); break; case 'export_download': diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php new file mode 100644 index 000000000..00a26ec1e --- /dev/null +++ b/sources/Controller/AjaxRenderController.php @@ -0,0 +1,116 @@ + 'error', 'percentage' => 100, 'message' => Dict::Format('UI:Error_Details', $aErr['message']))); + } + }); + + try { + $token = utils::ReadParam('token', null); + $sTokenForDisplay = utils::HtmlEntities($token); + $aResult = array( // Fallback error, just in case + 'code' => 'error', + 'percentage' => 100, + 'message' => "Export not found for token: '$sTokenForDisplay'", + ); + $data = ''; + if ($token === null) { + if ($bTokenOnly) { + throw new Exception('Access not allowed'); + } + $sFormat = utils::ReadParam('format', ''); + $sExpression = utils::ReadParam('expression', null, false, 'raw_data'); + $iQueryId = utils::ReadParam('query', null); + if ($sExpression === null) { + $oQuerySearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $iQueryId)); + $oQuerySearch->UpdateContextFromUser(); + $oQueries = new DBObjectSet($oQuerySearch); + if ($oQueries->Count() > 0) { + $oQuery = $oQueries->Fetch(); + $sExpression = $oQuery->Get('oql'); + } else { + $aResult = array('code' => 'error', 'percentage' => 100, 'message' => "Invalid query phrasebook identifier: '$iQueryId'"); + } + } + if ($sExpression !== null) { + $oSearch = DBObjectSearch::FromOQL($sExpression); + $oSearch->UpdateContextFromUser(); + $oExporter = BulkExport::FindExporter($sFormat, $oSearch); + $oExporter->SetObjectList($oSearch); + $oExporter->SetFormat($sFormat); + $oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE); + $oExporter->ReadParameters(); + } + + // First pass, generate the headers + $data .= $oExporter->GetHeader(); + } else { + $oExporter = BulkExport::FindExporterFromToken($token); + if (utils::ReadParam('start', 0, false, 'integer') == 1) { + // From portal, the first call is using a token + $data .= $oExporter->GetHeader(); + } + } + + if ($oExporter) { + $data .= $oExporter->GetNextChunk($aResult); + if ($aResult['code'] != 'done') { + $oExporter->AppendToTmpFile($data); + $aResult['token'] = $oExporter->SaveState(); + } else { + // Last pass + $data .= $oExporter->GetFooter(); + $oExporter->AppendToTmpFile($data); + $aResult['token'] = $oExporter->SaveState(); + if (substr($oExporter->GetMimeType(), 0, 5) == 'text/') { + // Result must be encoded in UTF-8 to be passed as part of a JSON structure + $sCharset = $oExporter->GetCharacterSet(); + if (strtoupper($sCharset) != 'UTF-8') { + $aResult['text_result'] = iconv($sCharset, 'UTF-8', file_get_contents($oExporter->GetTmpFilePath())); + } else { + $aResult['text_result'] = file_get_contents($oExporter->GetTmpFilePath()); + } + $aResult['mime_type'] = $oExporter->GetMimeType(); + } + $aResult['message'] = Dict::Format('Core:BulkExport:ClickHereToDownload_FileName', $oExporter->GetDownloadFileName()); + } + } + $oPage->add(json_encode($aResult)); + } catch (BulkExportException $e) { + $aResult = array('code' => 'error', 'percentage' => 100, 'message' => utils::HtmlEntities($e->GetLocalizedMessage())); + $oPage->add(json_encode($aResult)); + } catch (Exception $e) { + $aResult = array('code' => 'error', 'percentage' => 100, 'message' => utils::HtmlEntities($e->getMessage())); + $oPage->add(json_encode($aResult)); + } + } +} From dfcc3b22a6275919c33c8b8a364199f25d934ec1 Mon Sep 17 00:00:00 2001 From: BenGrenoble Date: Fri, 30 Oct 2020 16:47:19 +0100 Subject: [PATCH 13/13] Location/physicaldevice_list from structure to bridge. --- .../datamodel.itop-bridge-cmdb-ticket.xml | 967 ++--- .../datamodel.itop-structure.xml | 3373 ++++++++--------- 2 files changed, 2174 insertions(+), 2166 deletions(-) diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml index 3badea312..82bedd7a7 100644 --- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml +++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml @@ -1,474 +1,474 @@ - - - - - cmdbAbstractObject - - 1 - bizmodel - false - autoincrement - lnkfunctionalcitoticket - id - - - - - - - - - - - - - - - - - - - ticket_id - Ticket - false - DEL_AUTO - - - ticket_id - ref - - - ticket_id - title - - - functionalci_id - FunctionalCI - false - DEL_AUTO - - - functionalci_id - name - - - impact - - true - - - - manual - computed - not_impacted - - impact_code - manual - false - list - - - - -
- - - 10 - - - 20 - - - 30 - - -
- - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - - - - - cmdbAbstractObject - - 1 - bizmodel - false - autoincrement - lnkfunctionalcitoprovidercontract - id - - - - - - - - - - - - - - - - - - - providercontract_id - ProviderContract - false - DEL_AUTO - - - providercontract_id - name - - - functionalci_id - FunctionalCI - false - DEL_AUTO - - - functionalci_id - name - - - - -
- - - 10 - - - 20 - - -
- - - - 10 - - - 20 - - - - - - - 10 - - - 20 - - - - - - - cmdbAbstractObject - - 1 - bizmodel - false - autoincrement - lnkfunctionalcitoservice - id - - - - - - - - - - - - - - - - - - - service_id - Service - false - DEL_AUTO - - - service_id - name - - - functionalci_id - FunctionalCI - false - DEL_AUTO - - - functionalci_id - name - - - - -
- - - 10 - - - 20 - - -
- - - - 10 - - - 20 - - - - - - - 10 - - - 20 - - - - - - - - - lnkFunctionalCIToProviderContract - functionalci_id - 0 - 0 - providercontract_id - - - - lnkFunctionalCIToService - functionalci_id - 0 - 0 - service_id - - - - lnkFunctionalCIToTicket - functionalci_id - 0 - 0 - ticket_id - - - - -
- - - 100 - - - 110 - - -
- - - - -
- - - 60 - - - 70 - - -
- - - - -
- - - 100 - - - 110 - - -
- - - - -
- - - 120 - - - 130 - - -
- - - - -
- - - 160 - - - 170 - - -
- - - - -
- - - 160 - - - 170 - - -
- - - - -
- - - 160 - - - 170 - - -
- - - - -
- - - 150 - - - 160 - - -
- - - - -
- - - 150 - - - 160 - - -
- - - - -
- - - 110 - - - 120 - - -
- - - - -
- - - 110 - - - 120 - - -
- - - - -
- - - 120 - - - 130 - - -
- - + + + + + cmdbAbstractObject + + 1 + bizmodel + false + autoincrement + lnkfunctionalcitoticket + id + + + + + + + + + + + + + + + + + + + ticket_id + Ticket + false + DEL_AUTO + + + ticket_id + ref + + + ticket_id + title + + + functionalci_id + FunctionalCI + false + DEL_AUTO + + + functionalci_id + name + + + impact + + true + + + + manual + computed + not_impacted + + impact_code + manual + false + list + + + + +
+ + + 10 + + + 20 + + + 30 + + +
+ + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + + + + + cmdbAbstractObject + + 1 + bizmodel + false + autoincrement + lnkfunctionalcitoprovidercontract + id + + + + + + + + + + + + + + + + + + + providercontract_id + ProviderContract + false + DEL_AUTO + + + providercontract_id + name + + + functionalci_id + FunctionalCI + false + DEL_AUTO + + + functionalci_id + name + + + + +
+ + + 10 + + + 20 + + +
+ + + + 10 + + + 20 + + + + + + + 10 + + + 20 + + + + + + + cmdbAbstractObject + + 1 + bizmodel + false + autoincrement + lnkfunctionalcitoservice + id + + + + + + + + + + + + + + + + + + + service_id + Service + false + DEL_AUTO + + + service_id + name + + + functionalci_id + FunctionalCI + false + DEL_AUTO + + + functionalci_id + name + + + + +
+ + + 10 + + + 20 + + +
+ + + + 10 + + + 20 + + + + + + + 10 + + + 20 + + + + + + + + + lnkFunctionalCIToProviderContract + functionalci_id + 0 + 0 + providercontract_id + + + + lnkFunctionalCIToService + functionalci_id + 0 + 0 + service_id + + + + lnkFunctionalCIToTicket + functionalci_id + 0 + 0 + ticket_id + + + + +
+ + + 100 + + + 110 + + +
+ + + + +
+ + + 60 + + + 70 + + +
+ + + + +
+ + + 100 + + + 110 + + +
+ + + + +
+ + + 120 + + + 130 + + +
+ + + + +
+ + + 160 + + + 170 + + +
+ + + + +
+ + + 160 + + + 170 + + +
+ + + + +
+ + + 160 + + + 170 + + +
+ + + + +
+ + + 150 + + + 160 + + +
+ + + + +
+ + + 150 + + + 160 + + +
+ + + + +
+ + + 110 + + + 120 + + +
+ + + + +
+ + + 110 + + + 120 + + +
+ + + + +
+ + + 120 + + + 130 + + +
+ +
@@ -486,6 +486,17 @@
+ + +
+ + + 90 + + +
+ +
@@ -520,13 +531,13 @@
- - - - - - - - - + + + + + + + + + diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index b9d262eb4..4c636da3f 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -1,246 +1,246 @@ - - - cmdbAbstractObject - - + + cmdbAbstractObject + + - bizmodel,searchable,structure - false - autoincrement - organization - id - - - - - - - - images/building.png - - - - - - - - - - - - - name - - false - - - code - - true - - - - active - inactive - - status - active - true - list - - - parent_id - true - DEL_MANUAL - - - parent_id - name - - - true - - DashboardLayoutTwoCols - - false - 300 - - - - 0 - - - 0 - Organization:Overview:FunctionalCIs - itop-config-mgmt/images/server.png - Organization:Overview:FunctionalCIs:subtitle - SELECT FunctionalCI WHERE org_id=:this->id - finalclass - NetworkDevice,Server,ApplicationSolution - - - - - 20 - - - 0 - Organization:Overview:Users - SELECT Person AS p JOIN User AS u ON u.contactid=p.id WHERE p.org_id=:this->id - true - - - - - 5 - - - 0 - - - - - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - -
- - - - 10 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - 10 - - - 20 - - - 30 - - - - - - - cmdbAbstractObject - - bizmodel,searchable,structure - false - autoincrement - location - id - - - - - - - - images/location.png - - - - - - - - - - - - - - name - - false - - - - active - inactive - - status - active - true - list - - - org_id - Organization - false - DEL_MANUAL - - - org_id - name - - - address - - true - - - postal_code - - true - - - city - - true - - - country - - true - + bizmodel,searchable,structure + false + autoincrement + organization + id + + + + + + + + images/building.png + + + + + + + + + + + + + name + + false + + + code + + true + + + + active + inactive + + status + active + true + list + + + parent_id + true + DEL_MANUAL + + + parent_id + name + + + true + + DashboardLayoutTwoCols + + false + 300 + + + + 0 + + + 0 + Organization:Overview:FunctionalCIs + itop-config-mgmt/images/server.png + Organization:Overview:FunctionalCIs:subtitle + SELECT FunctionalCI WHERE org_id=:this->id + finalclass + NetworkDevice,Server,ApplicationSolution + + + + + 20 + + + 0 + Organization:Overview:Users + SELECT Person AS p JOIN User AS u ON u.contactid=p.id WHERE p.org_id=:this->id + true + + + + + 5 + + + 0 + + + + + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + +
+ + + + 10 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + 10 + + + 20 + + + 30 + + + + + + + cmdbAbstractObject + + bizmodel,searchable,structure + false + autoincrement + location + id + + + + + + + + images/location.png + + + + + + + + + + + + + + name + + false + + + + active + inactive + + status + active + true + list + + + org_id + Organization + false + DEL_MANUAL + + + org_id + name + + + address + + true + + + postal_code + + true + + + city + + true + + + country + + true + Person location_id @@ -249,376 +249,373 @@ 0 - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - -
- - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - cmdbAbstractObject - - bizmodel,searchable,structure - true - autoincrement - contact - id - finalclass - - - - - - - images/team.png - - - - - - - - - - - status='inactive' - - - - - name - - false - - - - active - inactive - - status - active - false - list - - - org_id - Organization - false - DEL_MANUAL - - - org_id - name - - - email - - true - - - phone - - true - - - - yes - no - - notify - yes - true - radio_horizontal - - - function - - true - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - Contact - - bizmodel,searchable,structure - false - autoincrement - person - id - - - - - - - - - images/person.png - - - - - - - - - - - - - - - - - - false - true - - - - - - - - - false - false - - - - - - 96 - 96 - 128 - 128 - images/silhouette.png - true - - - first_name - - false - - - employee_number - - true - - - mobile_phone - - true - - - org_id]]> - - - - location_id - Location - true - DEL_MANUAL - false - - - location_id - name - - - - manager_id - Person - true - DEL_MANUAL - - - manager_id - name - - - lnkPersonToTeam - person_id - 0 - 0 - team_id - - - - - - false - public - Overload-DBObject - + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + +
+ + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + cmdbAbstractObject + + bizmodel,searchable,structure + true + autoincrement + contact + id + finalclass + + + + + + + images/team.png + + + + + + + + + + + status='inactive' + + + + + name + + false + + + + active + inactive + + status + active + false + list + + + org_id + Organization + false + DEL_MANUAL + + + org_id + name + + + email + + true + + + phone + + true + + + + yes + no + + notify + yes + true + radio_horizontal + + + function + + true + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + Contact + + bizmodel,searchable,structure + false + autoincrement + person + id + + + + + + + + + images/person.png + + + + + + + + + + + + + + + + + + false + true + + + + + + + + + false + false + + + + + + 96 + 96 + 128 + 128 + images/silhouette.png + true + + + first_name + + false + + + employee_number + + true + + + mobile_phone + + true + + + org_id]]> + + + + location_id + Location + true + DEL_MANUAL + false + + + location_id + name + + + + manager_id + Person + true + DEL_MANUAL + + + manager_id + name + + + lnkPersonToTeam + person_id + 0 + 0 + team_id + + + + + + false + public + Overload-DBObject + Get('demo_mode')) { @@ -634,12 +631,12 @@ return parent::CheckToDelete($oDeletionPlan); } ]]> - - - false - public - Overload-DBObject - + + false + public + Overload-DBObject + Get('demo_mode')) { @@ -652,12 +649,12 @@ parent::DBDeleteSingleObject(); } ]]> - - - false - public - Overload-DBObject - + + false + public + Overload-DBObject + IsNew()) ) { @@ -673,12 +670,12 @@ return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState); } ]]> - - - false - public - Helper - + + false + public + Helper + - - - -
- - - 10 - - - 40 - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - - - - - 50 - - - 5 - - - 10 - - - - - 10 - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - - 90 - - - 100 - - - 110 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - - - - - Contact - - bizmodel,searchable - false - autoincrement - team - id - - - - - - - - images/team.png - - - - - - - - - - - - lnkPersonToTeam - team_id - 0 - 0 - person_id - - - - - -
- - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - 80 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - 60 - - - 70 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - cmdbAbstractObject - - 1 - bizmodel - false - autoincrement - lnkpersontoteam - id - - - - - - - - - - - - - - - - - - - team_id - Team - false - DEL_AUTO - - - team_id - name - - - person_id - Person - false - DEL_AUTO - - - person_id - name - - - role_id - ContactType - true - DEL_MANUAL - - - role_id - name - - - - -
- - - 10 - - - 20 - - - 30 - - -
- - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - - - - - cmdbAbstractObject - - bizmodel,searchable - true - autoincrement - typology - id - finalclass - - - - - - - - - - - - - - - - - name - - false - - - - -
- - - 10 - - -
- - - - 10 - - - - - - - 10 - - - - - - - 10 - - - - - - - cmdbAbstractObject - - bizmodel,searchable - true - autoincrement - document - id - finalclass - - - - - images/document.png - - - - - - - - - - - - - - - name - - false - - - org_id - Organization - false - DEL_MANUAL - - - org_id - name - - - documenttype_id - DocumentType - true - DEL_MANUAL - - - documenttype_id - name - - - version - - true - - - description - - true - - - - draft - published - obsolete - - status - - true - list - - - - -
- - - 10 - - - 20 - - - 30 - - - 35 - - - 40 - - - 50 - - -
- - - - 10 - - - 20 - - - 30 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - Document - - bizmodel,searchable - false - autoincrement - documentfile - id - - - - - - - - images/document.png - - - - - - - - - - - - - - false - public - Overload-cmdbAbstractObject - + + +
+ + + 10 + + + 40 + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + + + + + 50 + + + 5 + + + 10 + + + + + 10 + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + + 90 + + + 100 + + + 110 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + + + + + Contact + + bizmodel,searchable + false + autoincrement + team + id + + + + + + + + images/team.png + + + + + + + + + + + + lnkPersonToTeam + team_id + 0 + 0 + person_id + + + + + +
+ + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + 80 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + 60 + + + 70 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + cmdbAbstractObject + + 1 + bizmodel + false + autoincrement + lnkpersontoteam + id + + + + + + + + + + + + + + + + + + + team_id + Team + false + DEL_AUTO + + + team_id + name + + + person_id + Person + false + DEL_AUTO + + + person_id + name + + + role_id + ContactType + true + DEL_MANUAL + + + role_id + name + + + + +
+ + + 10 + + + 20 + + + 30 + + +
+ + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + + + + + cmdbAbstractObject + + bizmodel,searchable + true + autoincrement + typology + id + finalclass + + + + + + + + + + + + + + + + + name + + false + + + + +
+ + + 10 + + +
+ + + + 10 + + + + + + + 10 + + + + + + + 10 + + + + + + + cmdbAbstractObject + + bizmodel,searchable + true + autoincrement + document + id + finalclass + + + + + images/document.png + + + + + + + + + + + + + + + name + + false + + + org_id + Organization + false + DEL_MANUAL + + + org_id + name + + + documenttype_id + DocumentType + true + DEL_MANUAL + + + documenttype_id + name + + + version + + true + + + description + + true + + + + draft + published + obsolete + + status + + true + list + + + + +
+ + + 10 + + + 20 + + + 30 + + + 35 + + + 40 + + + 50 + + +
+ + + + 10 + + + 20 + + + 30 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + Document + + bizmodel,searchable + false + autoincrement + documentfile + id + + + + + + + + images/document.png + + + + + + + + + + + + + + false + public + Overload-cmdbAbstractObject + - - - - -
- - - 10 - - - 20 - - - 30 - - - 35 - - - 40 - - - 50 - - - 60 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - Document - - bizmodel,searchable - false - autoincrement - documentnote - id - - - - - - - - images/document.png - - - - - - - - - - - text - - false - - - - -
- - - 10 - - - 20 - - - 30 - - - 35 - - - 40 - - - 50 - - - 60 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - Document - - bizmodel,searchable - false - autoincrement - documentweb - id - - - - - - - - images/document.png - - - - - - - - - - - url - - true - _blank - - - - -
- - - 10 - - - 20 - - - 30 - - - 35 - - - 40 - - - 50 - - -
- - - - 10 - - - 20 - - - 30 - - - 40 - - - 50 - - - - - - - 10 - - - 20 - - - 30 - - - 40 - - - - - - - Typology - - bizmodel,searchable - false - autoincrement - documenttype - id - - - - - - - - - - - - - - - - - -
- - - 10 - - -
- - - - 10 - - - - - - - 10 - - - - - - - Typology - - bizmodel,searchable - false - autoincrement - contacttype - id - - - - - - - - - - - - - - - - - -
- - - 10 - - -
- - - - 10 - - - - - - - 10 - - - - - - - - 70 - Organization - UR_ACTION_MODIFY - UR_ALLOWED_YES - - - - - 10 - DataAdministration - $pages/csvimport.php - - - 33 - DataAdministration - $pages/audit.php - - - 50 - DataAdministration - - - - 10 - Catalogs - SELECT Organization - 1 - - - 20 - - - - 2 - ConfigManagement - - DashboardLayoutOneCol - - <cells> - <cell id="0"> - <rank>0</rank> - <dashlets> - <dashlet id="1" xsi:type="DashletHeaderDynamic"> - <rank>1</rank> - <title>Menu:Contact - itop-structure/images/team.png - Menu:Contact:Count - SELECT Contact - status - active,inactive - - - 2 - Team - - - 3 - Person - - - - - - - - 3 - Contact - Contact - - - 4 - Contact - Contact - - - 3 - ConfigManagement - SELECT Location - 1 - - - 6 - ConfigManagement - SELECT Document - 1 - - - 80 - Catalogs - - DashboardLayoutOneCol - Menu:ConfigManagement:Typology - - - 0 - - - 0 - Menu:ConfigManagement:Typology - itop-structure/images/typology.png - - - 8 - ContactType - - - 9 - DocumentType - - - - - - - - 100 - Catalogs - $pages/tagadmin.php - TagSetFieldData - UR_ACTION_MODIFY - - + + + +
+ + + 10 + + + 20 + + + 30 + + + 35 + + + 40 + + + 50 + + + 60 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + Document + + bizmodel,searchable + false + autoincrement + documentnote + id + + + + + + + + images/document.png + + + + + + + + + + + text + + false + + + + +
+ + + 10 + + + 20 + + + 30 + + + 35 + + + 40 + + + 50 + + + 60 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + Document + + bizmodel,searchable + false + autoincrement + documentweb + id + + + + + + + + images/document.png + + + + + + + + + + + url + + true + _blank + + + + +
+ + + 10 + + + 20 + + + 30 + + + 35 + + + 40 + + + 50 + + +
+ + + + 10 + + + 20 + + + 30 + + + 40 + + + 50 + + + + + + + 10 + + + 20 + + + 30 + + + 40 + + + + + + + Typology + + bizmodel,searchable + false + autoincrement + documenttype + id + + + + + + + + + + + + + + + + + +
+ + + 10 + + +
+ + + + 10 + + + + + + + 10 + + + + + + + Typology + + bizmodel,searchable + false + autoincrement + contacttype + id + + + + + + + + + + + + + + + + + +
+ + + 10 + + +
+ + + + 10 + + + + + + + 10 + + + + + + + + 70 + Organization + UR_ACTION_MODIFY + UR_ALLOWED_YES + + + + + 10 + DataAdministration + $pages/csvimport.php + + + 33 + DataAdministration + $pages/audit.php + + + 50 + DataAdministration + + + + 10 + Catalogs + SELECT Organization + 1 + + + 20 + + + + 2 + ConfigManagement + + DashboardLayoutOneCol + + <cells> + <cell id="0"> + <rank>0</rank> + <dashlets> + <dashlet id="1" xsi:type="DashletHeaderDynamic"> + <rank>1</rank> + <title>Menu:Contact + itop-structure/images/team.png + Menu:Contact:Count + SELECT Contact + status + active,inactive + + + 2 + Team + + + 3 + Person + + + + + + + + 3 + Contact + Contact + + + 4 + Contact + Contact + + + 3 + ConfigManagement + SELECT Location + 1 + + + 6 + ConfigManagement + SELECT Document + 1 + + + 80 + Catalogs + + DashboardLayoutOneCol + Menu:ConfigManagement:Typology + + + 0 + + + 0 + Menu:ConfigManagement:Typology + itop-structure/images/typology.png + + + 8 + ContactType + + + 9 + DocumentType + + + + + + + + 100 + Catalogs + $pages/tagadmin.php + TagSetFieldData + UR_ACTION_MODIFY + +