Skip to content

N°9553 - Fix on LoadLocalizedData in ModuleInstaller #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v-dumas merged 29 commits into from
Jul 10, 2026
Merged

N°9553 - Fix on LoadLocalizedData in ModuleInstaller #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
93fb185
N°9553 - LoadLocalizedData: review feedbacks + improved tests
v-dumas Jun 1, 2026
4033151
N°9553 - take into account feedbacks from review
v-dumas Jun 1, 2026
4f7b7ae
N°9553 - fix typo
v-dumas Jun 1, 2026
b5575b3
N°9553 - Refactor methods to be clearer on what it does
v-dumas Jun 2, 2026
3d3c9f6
N°9553 - Support of localized sample and structural files
v-dumas Jun 23, 2026
65d1578
N°9553 - Finalize localized sample and structural data
v-dumas Jul 7, 2026
80f44b0
Fix change from pattern to en_us.xml hardcoded
v-dumas Jul 8, 2026
45849ad
Fix method header
v-dumas Jul 8, 2026
3caea82
Fix test method header comment
v-dumas Jul 8, 2026
495aac8
N°9553 - Fix method signature
v-dumas Jul 8, 2026
912915c
N°9553 - Add german structural and sample data
v-dumas Jul 8, 2026
ed5dfaf
N°9553 - Fix file renaming
v-dumas Jul 8, 2026
24713bc
N°9553 - rename structural Query files
v-dumas Jul 8, 2026
e3d799c
Restore Default language retrieval in case of Upgrade
v-dumas Jul 8, 2026
315a702
N°9553 - Fix tests with local data
v-dumas Jul 8, 2026
9b51fce
Potential fix for pull request finding
v-dumas Jul 9, 2026
674f8b2
Potential fix for pull request finding
v-dumas Jul 9, 2026
557401b
Potential fix for pull request finding
v-dumas Jul 9, 2026
aa6c8e2
Potential fix for pull request finding
v-dumas Jul 9, 2026
225b2be
Potential fix for pull request finding
v-dumas Jul 9, 2026
bd266b2
Potential fix for pull request finding
v-dumas Jul 9, 2026
87691d4
Potential fix for pull request finding
v-dumas Jul 9, 2026
5114081
Potential fix for pull request finding
v-dumas Jul 9, 2026
d7ebfeb
Potential fix for pull request finding
v-dumas Jul 9, 2026
71e7538
Potential fix for pull request finding
v-dumas Jul 9, 2026
20645a4
N°9553 - Changes based on Copilot feedbacks
v-dumas Jul 9, 2026
d516262
N°9553 - Fix test
v-dumas Jul 9, 2026
04f2329
Fix wrong parent org in test data
v-dumas Jul 9, 2026
9b2c92e
N°9553 - Add comments on helper methods to explain their purpose
v-dumas Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions datamodels/2.x/itop-config-mgmt/data/data.sample.networkdevicetype.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
],
'data.sample' => [
'data/data.sample.model.xml',
'data/data.sample.networkdevicetype.xml',
'data/data.sample.servers.xml',
'data/data.sample.nw-devices.xml',
'data/data.sample.software.xml',
Expand Down Expand Up @@ -106,6 +105,7 @@ public static function BeforeDatabaseCreation(Config $oConfiguration, $sPrevious
*/
public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
{

}
}
}
15 changes: 15 additions & 0 deletions datamodels/2.x/itop-service-mgmt-provider/data/data.itop-contracttype.de_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<ContractType alias="ContractType" id="78">
<name>Hosting</name>
</ContractType>
<ContractType alias="ContractType" id="79">
<name>IT-Outsourcing</name>
</ContractType>
<ContractType alias="ContractType" id="77">
<name>Wartung</name>
</ContractType>
<ContractType alias="ContractType" id="76">
<name>Support</name>
</ContractType>
</Set>
29 changes: 29 additions & 0 deletions datamodels/2.x/itop-service-mgmt-provider/data/data.sample.customercontracts.de_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<CustomerContract alias="CustomerContract" id="3">
<name>Kundenvertrag</name>
<org_id>7</org_id>
<description>Kundenvertrag zur Bereitstellung von Services fuer einen externen Kunden.</description>
<start_date>2026-01-01</start_date>
<end_date>2030-12-31</end_date>
<cost>10000</cost>
<cost_currency>euros</cost_currency>
<contracttype_id>79</contracttype_id>
<billing_frequency>yearly</billing_frequency>
<provider_id>2</provider_id>
<status>production</status>
</CustomerContract>
<CustomerContract alias="CustomerContract" id="1">
<name>Kundenvertrag Vertriebsabteilung</name>
<org_id>6</org_id>
<description>Interner Vertrag zur Bereitstellung von Services fuer die Vertriebsabteilung</description>
<start_date>2019-01-01</start_date>
<end_date>2030-12-31</end_date>
<cost>0</cost>
<cost_currency>euros</cost_currency>
<contracttype_id>0</contracttype_id>
<billing_frequency>monthly</billing_frequency>
<provider_id>2</provider_id>
<status>production</status>
</CustomerContract>
</Set>
219 changes: 219 additions & 0 deletions datamodels/2.x/itop-service-mgmt-provider/data/data.sample.serviceelements.de_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<ServiceSubcategory alias="ServiceSubcategory" id="28">
<name>Zugriffsprobleme</name>
<description>Hilfe bei einem Zugriffsproblem anfordern</description>
<service_id>7</service_id>
<request_type>incident</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="17">
<name>API-Integration</name>
<description>Verbindung zwischen internen und externen Anwendungen.</description>
<service_id>2</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="13">
<name>CRM (z. B. Salesforce, HubSpot)</name>
<description>Einrichtung, Anpassung und Support für das Customer-Relationship-Management.</description>
<service_id>2</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="22">
<name>Sensibilisierung für Cybersicherheit</name>
<description>Schulung der Mitarbeitenden zu bewährten Praktiken (Phishing, Passwörter usw.).</description>
<service_id>6</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="3">
<name>Datensicherung</name>
<description>Automatische Sicherung kritischer Dateien (täglich/wöchentlich/monatlich).</description>
<service_id>3</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="21">
<name>Datenschutz (DSGVO)</name>
<description>Unterstützung bei der Einhaltung gesetzlicher Vorgaben (DSGVO, HIPAA usw.).</description>
<service_id>6</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="1">
<name>ERP (z. B. SAP, Odoo)</name>
<description>Zugriff, Support und Schulung für integrierte Managementsoftware.</description>
<service_id>2</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="10">
<name>Dateispeicherung und -freigabe</name>
<description>Bereitstellung kollaborativer Speicherbereiche (z. B. SharePoint, Nextcloud).</description>
<service_id>3</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="12">
<name>Hardwarevorfall</name>
<description>Unterstützung bei einem Hardwareausfall anfordern.</description>
<service_id>1</service_id>
<request_type>incident</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="19">
<name>Hardware-Upgrade</name>
<description>Austausch oder Erweiterung von Komponenten (RAM, Festplatte usw.).</description>
<service_id>1</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="7">
<name>Lokales Netzwerk (LAN/Wi-Fi)</name>
<description>Installation, Konfiguration und Wartung von Netzwerkgeräten.</description>
<service_id>3</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="27">
<name>Multi-Faktor-Authentifizierung (MFA)</name>
<description>Konfiguration und Support für Multi-Faktor-Authentifizierung.</description>
<service_id>7</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="4">
<name>Fehlerbehebung im Netzwerk</name>
<description>Hilfe bei der Behebung eines Netzwerkproblems anfordern.</description>
<service_id>3</service_id>
<request_type>incident</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="5">
<name>Bestellung neuer Desktop-Computer</name>
<description>Einen neuen Desktop-Computer für neue Mitarbeitende oder als Ersatz für ein altes System bestellen.</description>
<service_id>1</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="8">
<name>Bestellung neuer Laptops</name>
<description>Einen neuen Laptop für mobile Mitarbeitende oder als Ersatz für ein altes Gerät bestellen.</description>
<service_id>1</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="11">
<name>Neues Peripheriegerät</name>
<description>Ein Peripheriegerät bestellen: Tastatur, Maus, persönlicher Drucker ...</description>
<service_id>1</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="20">
<name>Sicherheitsaudit</name>
<description>Schwachstellenanalysen, Penetrationstests und Empfehlungen.</description>
<service_id>6</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="23">
<name>Sicherheitsvorfall</name>
<description>Reaktion auf Cyberangriffe, Datenlecks oder Sicherheitsverletzungen.</description>
<service_id>6</service_id>
<request_type>incident</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="6">
<name>Serververwaltung</name>
<description>Präventive Wartung, Software-Updates und 24/7-Überwachung.</description>
<service_id>3</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="16">
<name>Softwarevorfall</name>
<description>Hilfe bei der Behebung eines Softwareproblems anfordern.</description>
<service_id>1</service_id>
<request_type>incident</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="15">
<name>Softwarevorfall</name>
<description>Unterstützung bei einem softwarebezogenen Problem anfordern.</description>
<service_id>2</service_id>
<request_type>incident</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="18">
<name>Softwareinstallation</name>
<description>Bereitstellung von Office-Software (z. B. Microsoft 365, LibreOffice) und Geschäftssoftware.</description>
<service_id>1</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="14">
<name>Individuelle Entwicklung</name>
<description>Entwicklung maßgeschneiderter Tools (Dashboards, Automatisierungen, Skripte).</description>
<service_id>2</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="24">
<name>Benutzerkonto-Erstellung</name>
<description>Erstellung von Konten für neue Mitarbeitende oder Auftragnehmer.</description>
<service_id>7</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="26">
<name>Benutzerkonto-Löschung</name>
<description>Deaktivierung von Konten für ausscheidende Mitarbeitende oder am Ende ihrer Verträge.</description>
<service_id>7</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="25">
<name>Benutzerkonto-Aktualisierung</name>
<description>Hinzufügen oder Entfernen von Berechtigungen (z. B. Zugriff auf einen freigegebenen Ordner oder eine Anwendung).</description>
<service_id>7</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
<ServiceSubcategory alias="ServiceSubcategory" id="2">
<name>VPN-Zugriff</name>
<description>Konfiguration und Support für sicheren Fernzugriff auf interne Ressourcen.</description>
<service_id>3</service_id>
<request_type>service_request</request_type>
<status>production</status>
<approvalrule_id>0</approvalrule_id>
</ServiceSubcategory>
</Set>
12 changes: 12 additions & 0 deletions datamodels/2.x/itop-service-mgmt-provider/data/data.sample.servicefamilies.de_de.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<ServiceFamily alias="ServiceFamily" id="1">
<name>IT-Services</name>
<icon>
<mimetype>image/svg+xml</mimetype>
<filename>icons8-open-end-wrench.svg</filename>
<data>PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDggNDgiIHdpZHRoPSIyNDBweCIgaGVpZ2h0PSIyNDBweCI+PHJhZGlhbEdyYWRpZW50IGlkPSIwQkRKczNXdHBwTWdvNFk5QTdHZ2phIiBjeD0iOS4xNjkiIGN5PSIzOC42NyIgcj0iMTIuMTM1IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIuNzA2IiBzdG9wLWNvbG9yPSIjNzg3Zjg1Ii8+PHN0b3Agb2Zmc2V0PSIuNzEzIiBzdG9wLWNvbG9yPSIjN2E4MTg3Ii8+PHN0b3Agb2Zmc2V0PSIuNzkzIiBzdG9wLWNvbG9yPSIjOTA5ODlmIi8+PHN0b3Agb2Zmc2V0PSIuODY4IiBzdG9wLWNvbG9yPSIjOWRhNWFlIi8+PHN0b3Agb2Zmc2V0PSIuOTMiIHN0b3AtY29sb3I9IiNhMWFhYjMiLz48L3JhZGlhbEdyYWRpZW50PjxwYXRoIGZpbGw9InVybCgjMEJESnMzV3RwcE1nbzRZOUE3R2dqYSkiIGQ9Ik0xOS45MTUsMjEuOGMtNC42NzksNC42NzktOS4zNzUsOS4zNzUtOS41NTEsOS41NTFsNi4zNjQsNi4zNjQgYzAuMTc3LTAuMTc3LDQuODcyLTQuODcyLDkuNTUxLTkuNTUxTDE5LjkxNSwyMS44eiIvPjxyYWRpYWxHcmFkaWVudCBpZD0iMEJESnMzV3RwcE1nbzRZOUE3R2dqYiIgY3g9IjEzLjQyNSIgY3k9IjM1LjQ5OSIgcj0iMTQuNjg4IiBncmFkaWVudFRyYW5zZm9ybT0icm90YXRlKDE4MCAyNC4zMjIgMjMuNzU4KSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iLjcwNiIgc3RvcC1jb2xvcj0iIzc4N2Y4NSIvPjxzdG9wIG9mZnNldD0iLjcxMyIgc3RvcC1jb2xvcj0iIzdhODE4NyIvPjxzdG9wIG9mZnNldD0iLjc5MyIgc3RvcC1jb2xvcj0iIzkwOTg5ZiIvPjxzdG9wIG9mZnNldD0iLjg2OCIgc3RvcC1jb2xvcj0iIzlkYTVhZSIvPjxzdG9wIG9mZnNldD0iLjkzIiBzdG9wLWNvbG9yPSIjYTFhYWIzIi8+PC9yYWRpYWxHcmFkaWVudD48cGF0aCBmaWxsPSJ1cmwoIzBCREpzM1d0cHBNZ280WTlBN0dnamIpIiBkPSJNMjQuNzI4LDI5LjcxNWM0LjY3OS00LjY3OSw5LjM3NS05LjM3NSw5LjU1MS05LjU1MUwyNy45MTUsMTMuOCBjLTAuMTc3LDAuMTc3LTQuODcyLDQuODcyLTkuNTUxLDkuNTUxTDI0LjcyOCwyOS43MTV6Ii8+PGxpbmVhckdyYWRpZW50IGlkPSIwQkRKczNXdHBwTWdvNFk5QTdHZ2pjIiB4MT0iMjIuMTE5IiB4Mj0iMzMuOTI2IiB5MT0iLTI1NTIuODgzIiB5Mj0iLTI1NjQuNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoLTEgMCAwIDEgMzkuMDQ2IDI1OTguMDMzKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iIzhmOTc5ZSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI2ExYWFiMyIvPjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZmlsbD0idXJsKCMwQkRKczNXdHBwTWdvNFk5QTdHZ2pkKSIgZD0iTTQwLjY2MiwxMy4zMTJjLTEuNjk1LDEuNjk1LTQuNDQ1LDEuNjk1LTYuMTM5LDBzLTEuNjk1LTQuNDQ1LDAtNi4xMzkgYzAuNDE0LTAuNDE0LDIuMDgxLTIuMDgxLDMuNzgtMy43OGMwLjQwNy0wLjQwNywwLjIyNi0xLjExOS0wLjMzMi0xLjI1NmMtMS4zNzctMC4zMzgtMi44NTgtMC40MDktNC4zOTktMC4xMTkgYy00LjUxOSwwLjg1Mi04LjA0Myw0LjYzMy04LjUxMiw5LjIwN2MtMC42ODQsNi42Nyw0Ljg4MywxMi4yMzYsMTEuNTUzLDExLjU1MWM0LjU3NC0wLjQ3LDguMzU1LTMuOTk0LDkuMjA2LTguNTEzIGMwLjI5LTEuNTQxLDAuMjE5LTMuMDIxLTAuMTE5LTQuMzk4Yy0wLjEzOC0wLjU2LTAuODQ5LTAuNzQxLTEuMjU2LTAuMzMyQzQyLjc0MywxMS4yMzEsNDEuMDc2LDEyLjg5OSw0MC42NjIsMTMuMzEyeiIvPjwvc3ZnPgo=</data>
<downloads_count>0</downloads_count>
</icon>
</ServiceFamily>
</Set>
Loading