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])); } } } diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php index 3dc49c110..b4e3b018e 100644 --- a/core/cmdbobject.class.inc.php +++ b/core/cmdbobject.class.inc.php @@ -103,8 +103,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) { @@ -119,7 +123,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) { @@ -226,7 +234,9 @@ abstract class CMDBObject extends DBObject } /** - * 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 * * @throws \ArchivedObjectException * @throws \CoreCannotSaveObjectException 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 0d7e5be22..e192deb5a 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 @@ -9,469 +9,531 @@ 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 - - -
- - - - - - - - - - - + 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 + + +
+ + + + +
+ + + 70 + + + 80 + + + 90 + + +
+ + + + +
+ + + 90 + + +
+ + + + +
+ + + 60 + + + 70 + + + 80 + + +
+ + + + +
+ + + 70 + + + 80 + + + 90 + + +
+ + + + + + + + + + + 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..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', @@ -1540,8 +1536,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..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', @@ -1536,8 +1532,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..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', @@ -1539,8 +1535,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..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', @@ -1542,8 +1538,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..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', @@ -1541,8 +1537,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..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', @@ -1547,8 +1543,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..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', @@ -1533,8 +1529,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..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 @@ -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~~', @@ -1515,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', @@ -1536,8 +1530,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..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', @@ -1536,8 +1532,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..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', @@ -1548,8 +1544,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..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', @@ -1541,8 +1537,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..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-адреса', @@ -1526,8 +1522,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..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', @@ -1540,8 +1536,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..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', @@ -1542,8 +1538,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..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', @@ -1537,8 +1533,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-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... 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..8cb69e2f8 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', @@ -355,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 a4f4e045a..3fda2150f 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', @@ -342,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/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index 824b81a22..2aa1b5310 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -10,604 +10,608 @@ * @copyright Copyright (C) 2010-2017 Combodo SARL * @license http://opensource.org/licenses/AGPL-3.0 */]]> - 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 - - - - -
- - - 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 - 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 + add_only + 0 + 0 + + + + +
+ + + 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')) { @@ -623,12 +627,12 @@ return parent::CheckToDelete($oDeletionPlan); } ]]> - - - false - public - Overload-DBObject - + + false + public + Overload-DBObject + Get('demo_mode')) { @@ -641,12 +645,12 @@ parent::DBDeleteSingleObject(); } ]]> - - - false - public - Overload-DBObject - + + false + public + Overload-DBObject + IsNew()) ) { @@ -662,12 +666,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 - - - 70 - - - 80 - - - 90 - - -
- - - - 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 - - - 70 - - - 80 - - - 90 - - -
- - - - 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 - - - 60 - - - 70 - - - 80 - - -
- - - - 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 + + @@ -1808,4 +1785,10 @@ + + + + + + \ 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 0f3051340..b3c634c71 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', @@ -354,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 70db940f2..bb7e62797 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', @@ -377,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 5e3b60d6c..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 @@ -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', @@ -349,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 a67010afa..326b2469b 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', @@ -380,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 f19bed7d4..5c9151984 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', @@ -345,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 2ea205c8f..eff5ee4b6 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', @@ -343,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 b36f971dd..dd50df0f6 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' => '連絡先', @@ -344,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 7604691ff..4e6ea743a 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', @@ -350,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 763b8ab90..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 @@ -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', @@ -343,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 4df99bded..46c94f44d 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' => 'Контакты', @@ -329,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 13b9ac83f..e25d51a78 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', @@ -342,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 4f9843630..35a39332f 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', @@ -345,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 9afd2f100..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 @@ -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' => '联系人', @@ -342,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 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", +// ), ); } } diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php index 7f6cb5259..701cb28a1 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 0ff89f3f0..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 * @@ -57,14 +58,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 +79,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, );