composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-29 12:59:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve sample data error

Browse Source
This commit is contained in:
v-dumas
2026-06-19 09:27:05 +02:00
parent f4ce1d9a0e
commit d1fa15f760
12 changed files with 99 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
datamodels/2.x/itop-service-mgmt-provider/data/data.sample.customercontracts.en_us.xml
View File

@@ -15,16 +15,17 @@
<status>production</status>
</CustomerContract>
<CustomerContract alias="CustomerContract" id="1">
<name>Customer contract Sales department</name>
<org_id>6</org_id>
<description>Internal contract to deliver services to Sales department</description>
<start_date>2019-01-01</start_date>
<end_date>2030-12-31</end_date>
<cost></cost>
<cost_currency>euros</cost_currency>
<contracttype_id>0</contracttype_id>
<billing_frequency></billing_frequency>
<cost_unit></cost_unit>
<provider_id>2</provider_id>
<status>production</status>
<name>Customer contract Sales department</name>
<org_id>6</org_id>
<description>Internal contract to deliver services to Sales department</description>
<start_date>2019-01-01</start_date>
<end_date>2030-12-31</end_date>
<cost></cost>
<cost_currency>euros</cost_currency>
<contracttype_id>0</contracttype_id>
<billing_frequency></billing_frequency>
<cost_unit></cost_unit>
<provider_id>2</provider_id>
<status>production</status>
</CustomerContract>
</Set>

7
datamodels/2.x/itop-service-mgmt-provider/data/data.sample.customercontractsservice.xml
View File

@@ -4,42 +4,35 @@
<customercontract_id>3</customercontract_id>
<service_id>2</service_id>
<sla_id>3</sla_id>
<coveragewindow_id>3</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="6">
<customercontract_id>3</customercontract_id>
<service_id>3</service_id>
<sla_id>2</sla_id>
<coveragewindow_id>2</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="4">
<customercontract_id>1</customercontract_id>
<service_id>7</service_id>
<sla_id>4</sla_id>
<coveragewindow_id>3</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="2">
<customercontract_id>1</customercontract_id>
<service_id>2</service_id>
<sla_id>3</sla_id>
<coveragewindow_id>1</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="1">
<customercontract_id>1</customercontract_id>
<service_id>1</service_id>
<sla_id>4</sla_id>
<coveragewindow_id>3</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="3">
<customercontract_id>1</customercontract_id>
<service_id>3</service_id>
<sla_id>2</sla_id>
<coveragewindow_id>2</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="5">
<customercontract_id>1</customercontract_id>
<service_id>6</service_id>
<sla_id>3</sla_id>
<coveragewindow_id>1</coveragewindow_id>
</lnkCustomerContractToService>
</Set>

29
datamodels/2.x/itop-service-mgmt-provider/data/data.sample.providercontracts.xml
View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<ProviderContract alias="ProviderContract" id="2">
<name>Maintenance contract</name>
<org_id>3</org_id>
<description>Maintenance contract for hardware and software</description>
<start_date>2024-01-01</start_date>
<end_date>2033-12-31</end_date>
<cost></cost>
<cost_currency>euros</cost_currency>
<contracttype_id>0</contracttype_id>
<billing_frequency></billing_frequency>
<cost_unit></cost_unit>
<provider_id>4</provider_id>
<status>production</status>
<sla></sla>
<coverage></coverage>
<name>Maintenance contract</name>
<org_id>3</org_id>
<description>Maintenance contract for hardware and software</description>
<start_date>2024-01-01</start_date>
<end_date>2033-12-31</end_date>
<cost></cost>
<cost_currency>euros</cost_currency>
<contracttype_id>0</contracttype_id>
<billing_frequency></billing_frequency>
<cost_unit></cost_unit>
<provider_id>4</provider_id>
<status>production</status>
<sla></sla>
<coverage></coverage>
</ProviderContract>
</Set>

13
datamodels/2.x/itop-service-mgmt-provider/data/data.sample.providercontractsservice.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<lnkProviderContractToService alias="lnkProviderContractToService" id="1">
<providercontract_id>2</providercontract_id>
<provider_id>4</provider_id>
<service_id>5</service_id>
</lnkProviderContractToService>
<lnkProviderContractToService alias="lnkProviderContractToService" id="2">
<providercontract_id>2</providercontract_id>
<provider_id>4</provider_id>
<service_id>4</service_id>
</lnkProviderContractToService>
</Set>

12
datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
View File

@@ -23,7 +23,7 @@ SetupWebPage::AddModule(
'datamodel' => [
],
'data.struct' => [
// 'data/data.itop-contracttype.{{language_code}}.xml',
'data/data.itop-contracttype.en_us.xml',
],
'data.sample' => [
// 'data/data.sample.contracts.xml', => replaced by localized data
@@ -43,7 +43,7 @@ SetupWebPage::AddModule(
'data/data.sample.sltsla.xml',
// 'data/data.sample.contractservice.xml', => replaced by customercontractservice and providercontractservice files
'data/data.sample.customercontractservice.xml',
'data/data.sample.providercontractservice.xml',
// 'data/data.sample.providercontractservice.xml', => Not available in this installation mode
'data/data.sample.deliverymodel.xml',
'data/data.sample.deliverymodelcontact.xml',
'data/data.sample.organizations.xml',
@@ -96,14 +96,6 @@ if (!class_exists('ServiceMgmtProviderInstaller')) {
*/
public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
{
// Load localized structural data: contract types
static::LoadLocalizedData(
$oConfiguration,
$sPreviousVersion,
$sCurrentVersion,
'3.3.0',
__DIR__."/data/data.itop-contracttype.{{language_code}}.xml"
);
}
}
}

7
datamodels/2.x/itop-service-mgmt/data/data.sample.customercontractsservice.xml
View File

@@ -4,42 +4,35 @@
<customercontract_id>3</customercontract_id>
<service_id>2</service_id>
<sla_id>3</sla_id>
<coveragewindow_id>3</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="6">
<customercontract_id>3</customercontract_id>
<service_id>3</service_id>
<sla_id>2</sla_id>
<coveragewindow_id>2</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="4">
<customercontract_id>1</customercontract_id>
<service_id>7</service_id>
<sla_id>4</sla_id>
<coveragewindow_id>3</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="2">
<customercontract_id>1</customercontract_id>
<service_id>2</service_id>
<sla_id>3</sla_id>
<coveragewindow_id>1</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="1">
<customercontract_id>1</customercontract_id>
<service_id>1</service_id>
<sla_id>4</sla_id>
<coveragewindow_id>3</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="3">
<customercontract_id>1</customercontract_id>
<service_id>3</service_id>
<sla_id>2</sla_id>
<coveragewindow_id>2</coveragewindow_id>
</lnkCustomerContractToService>
<lnkCustomerContractToService alias="lnkCustomerContractToService" id="5">
<customercontract_id>1</customercontract_id>
<service_id>6</service_id>
<sla_id>3</sla_id>
<coveragewindow_id>1</coveragewindow_id>
</lnkCustomerContractToService>
</Set>

2
datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
View File

@@ -23,7 +23,7 @@ SetupWebPage::AddModule(
'datamodel' => [
],
'data.struct' => [
// 'data/data.itop-contracttype.{{language_code}}.xml',
'data/data.itop-contracttype.en_us.xml',
],
'data.sample' => [
// 'data/data.sample.contracts.xml', => replaced by localized data

19
datamodels/2.x/itop-structure/data/data.sample.auditcategory-auditdomain.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
</lnkAuditCategoryToAuditDomain>
<lnkAuditCategoryToAuditDomain alias="lnkAuditCategoryToAuditDomain" id="2">
<category_id>3</category_id>
<domain_id>3</domain_id>
</lnkAuditCategoryToAuditDomain>
<lnkAuditCategoryToAuditDomain alias="lnkAuditCategoryToAuditDomain" id="3">
<category_id>4</category_id>
<domain_id>3</domain_id>
</lnkAuditCategoryToAuditDomain>
</Set>
<lnkAuditCategoryToAuditDomain alias="lnkAuditCategoryToAuditDomain" id="2">
<category_id>3</category_id>
<domain_id>3</domain_id>
</lnkAuditCategoryToAuditDomain>
<lnkAuditCategoryToAuditDomain alias="lnkAuditCategoryToAuditDomain" id="3">
<category_id>4</category_id>
<domain_id>3</domain_id>
</lnkAuditCategoryToAuditDomain>
</Set>

5
datamodels/2.x/itop-structure/data/data.sample.organizations.xml
View File

@@ -13,7 +13,6 @@
</data>
<downloads_count>0</downloads_count>
</logo>
<deliverymodel_id>2</deliverymodel_id>
</Organization>
<Organization alias="Organization" id="3">
<name>Demo</name>
@@ -28,7 +27,6 @@
</data>
<downloads_count>0</downloads_count>
</logo>
<deliverymodel_id>1</deliverymodel_id>
</Organization>
<Organization alias="Organization" id="5">
<name>HR Department</name>
@@ -37,7 +35,6 @@
<parent_id>3</parent_id>
<overview></overview>
<logo></logo>
<deliverymodel_id>1</deliverymodel_id>
</Organization>
<Organization alias="Organization" id="4">
<name>InfraStore</name>
@@ -55,7 +52,6 @@
<parent_id>3</parent_id>
<overview></overview>
<logo></logo>
<deliverymodel_id>1</deliverymodel_id>
</Organization>
<Organization alias="Organization" id="1">
<name>My Company/Department</name>
@@ -73,6 +69,5 @@
<parent_id>3</parent_id>
<overview></overview>
<logo></logo>
<deliverymodel_id>1</deliverymodel_id>
</Organization>
</Set>

98
datamodels/2.x/itop-structure/data/data.sample.persons.xml
View File

File diff suppressed because one or more lines are too long

8
datamodels/2.x/itop-structure/data/data.sample.users.xml
View File

@@ -26,7 +26,7 @@
</allowed_org_list>
<log></log>
<reset_pwd_token></reset_pwd_token>
<password>R6rQ;p]JT*FA$aaP^4</password>
<password><![CDATA[R6rQ;p]JT*FA$aaP^4]]></password>
<expiration>force_expire</expiration>
<password_renewed_date>2026-06-04</password_renewed_date>
</UserLocal>
@@ -56,7 +56,7 @@
</allowed_org_list>
<log></log>
<reset_pwd_token></reset_pwd_token>
<password>$W[:"7+Gf"Y\sd8#E~</password>
<password><![CDATA[$W[:"7+Gf"Y\sd8#E~]]></password>
<expiration>force_expire</expiration>
<password_renewed_date>2026-06-04</password_renewed_date>
</UserLocal>
@@ -92,7 +92,7 @@
</allowed_org_list>
<log></log>
<reset_pwd_token></reset_pwd_token>
<password>-Why]KDdMJvkuB8#e</password>
<password><![CDATA[-Why]KDdMJvkuB8#e]]></password>
<expiration>force_expire</expiration>
<password_renewed_date>2026-04-17</password_renewed_date>
</UserLocal>
@@ -133,7 +133,7 @@
</allowed_org_list>
<log></log>
<reset_pwd_token></reset_pwd_token>
<password>D%r7hoZ})5*hvq5`{Q</password>
<password><![CDATA[D%r7hoZ})5*hvq5`{Q]]></password>
<expiration>force_expire</expiration>
<password_renewed_date>2026-06-04</password_renewed_date>
</UserLocal>

21
datamodels/2.x/itop-structure/module.itop-structure.php
View File

@@ -23,8 +23,8 @@ SetupWebPage::AddModule(
'main.itop-structure.php',
],
'data.struct' => [
// 'data/data.itop-contacttype.{{language_code}}.xml',
// 'data/data.itop-documenttype.{{language_code}}.xm',
'data/data.itop-contacttype.en_us.xml',
'data/data.itop-documenttype.en_us.xml',
],
'data.sample' => [
'data/data.sample.organizations.xml',
@@ -37,7 +37,7 @@ SetupWebPage::AddModule(
'data/data.sample.auditcategory.xml',
'data/data.sample.auditcategory-auditdomain.xml',
'data/data.sample.auditrule.xml',
'data/data.sample.users.xml',
'data/data.sample.users.xml', // pb with the passwords, which cannot be loaded (check with empty?)
],
// Documentation
@@ -106,21 +106,6 @@ if (!class_exists('StructureInstaller')) {
*/
public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
{
// Load localized structural data: contact types and document types
static::LoadLocalizedData(
$oConfiguration,
$sPreviousVersion,
$sCurrentVersion,
'3.3.0',
__DIR__."/data/data.itop-contacttype.{{language_code}}.xml"
);
static::LoadLocalizedData(
$oConfiguration,
$sPreviousVersion,
$sCurrentVersion,
'3.3.0',
__DIR__."/data/data.itop-documenttype.{{language_code}}.xml"
);
// Default language will be used for actions
// Note: There is a issue when upgrading, default language cannot be retrieved from the passed configuration, we have to read it from the disk