composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 14:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°659 Uniqueness rules : description and error message are now picked in dictionaries entries with the $sClassName/UniquenessRule:$sUniquenessRuleId convention

Browse Source
This commit is contained in:
Pierre Goiffon
2018-11-20 10:43:23 +01:00
parent 99e909dae4
commit 0c49641094
17 changed files with 125 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/dbobject.class.php
View File

@@ -1427,7 +1427,7 @@ abstract class DBObject implements iDisplay
$sCurrentClass = get_class($this);
$aUniquenessRules = MetaModel::GetUniquenessRules($sCurrentClass);
foreach ($aUniquenessRules as $sUniquenessRuleName => $aUniquenessRuleProperties)
foreach ($aUniquenessRules as $sUniquenessRuleId => $aUniquenessRuleProperties)
{
if ($aUniquenessRuleProperties['disabled'] === true)
{
@@ -1445,8 +1445,7 @@ abstract class DBObject implements iDisplay
$bIsBlockingRule = true;
}
$sErrorKey = $aUniquenessRuleProperties['error_message'];
$sErrorMessage = $this->GetUniquenessRuleMessage($sErrorKey, $sUniquenessRuleName);
$sErrorMessage = $this->GetUniquenessRuleMessage($sUniquenessRuleId);
if ($bIsBlockingRule)
{
@@ -1460,20 +1459,26 @@ abstract class DBObject implements iDisplay
}
/**
* @param string $sMessageKey string or dictionnary key, could be empty
* @param string $sUniquenessRuleName
* @param string $sUniquenessRuleId
*
* @return string dict key : Class:$sClassName/UniquenessRule:$sUniquenessRuleId
* if none then will use Core:UniquenessDefaultError
* Dictionary keys can contain "$this" placeholders
*
* @return string
* @since 2.6 N°659 uniqueness constraint
*/
protected function GetUniquenessRuleMessage($sMessageKey, $sUniquenessRuleName)
protected function GetUniquenessRuleMessage($sUniquenessRuleId)
{
if (empty($sMessageKey))
$sCurrentClass = get_class($this);
$sMessageKey = "Class:$sCurrentClass/UniquenessRule:$sUniquenessRuleId";
$sTemplate = Dict::S($sMessageKey, '');
if (empty($sTemplate))
{
return Dict::Format('Core:UniquenessDefaultError', $sUniquenessRuleName);
//TODO if admin add message key is missing
return Dict::Format('Core:UniquenessDefaultError', $sUniquenessRuleId);
}
$sTemplate = Dict::S($sMessageKey);
$oString = new TemplateString($sTemplate);
return $oString->Render(array('this' => $this));

16
datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php
View File

@@ -208,10 +208,10 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1303,8 +1303,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Fyzická zařízení',
'Class:Brand/Attribute:physicaldevices_list+' => 'Všechna fyzická zařízení odpovídající této značce',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1358,8 +1358,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Class:Model/Attribute:type/Value:Phone+' => '',
'Class:Model/Attribute:physicaldevices_list' => 'Fyzická zařízení',
'Class:Model/Attribute:physicaldevices_list+' => 'Všechna fyzická zařízení odpovídající tomuto modelu',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php
View File

@@ -201,10 +201,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1296,8 +1296,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Fysisk enhed',
'Class:Brand/Attribute:physicaldevices_list+' => '',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1351,8 +1351,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
'Class:Model/Attribute:physicaldevices_list' => 'Fyisk enhed',
'Class:Model/Attribute:physicaldevices_list+' => '',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

8
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -556,8 +556,6 @@
<filter><![CDATA[employee_number != '']]></filter>
<disabled>false</disabled>
<is_blocking>true</is_blocking>
<description>Class:Person/UniquenessRule:employee_number/Description</description>
<error_message>Class:Person/UniquenessRule:employee_number/Error</error_message>
</rule>
<rule id="name">
<attributes>
@@ -568,8 +566,6 @@
<filter/>
<disabled>false</disabled>
<is_blocking>false</is_blocking>
<description>Class:Person/UniquenessRule:name/Description</description>
<error_message>Class:Person/UniquenessRule:name/Error</error_message>
</rule>
</uniqueness_rules>
</properties>
@@ -5871,8 +5867,6 @@
<attribute id="name"/>
</attributes>
<is_blocking>true</is_blocking>
<description>Class:Brand/UniquenessRule:name/Description</description>
<error_message>Class:Brand/UniquenessRule:name/Error</error_message>
</rule>
</uniqueness_rules>
</properties>
@@ -5945,8 +5939,6 @@
<attribute id="brand_id"/>
</attributes>
<is_blocking>true</is_blocking>
<description>Class:Model/UniquenessRule:name_brand/Description</description>
<error_message>Class:Model/UniquenessRule:name_brand/Error</error_message>
</rule>
</uniqueness_rules>
</properties>

16
datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
View File

@@ -203,10 +203,10 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Bild',
'Class:Person/Attribute:picture+' => '',
'Class:Person/UniquenessRule:employee_number/Description' => 'Die Personalnummer muss innerhalb dieser Organisation eindeutig sein.',
'Class:Person/UniquenessRule:employee_number/Error' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit der gleichen Personalnummer',
'Class:Person/UniquenessRule:name/Description' => 'Innerhalb einer Organisation muss der Name einer Person eindeutig sein',
'Class:Person/UniquenessRule:name/Error' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit dem gleichen Namen',
'Class:Person/UniquenessRule:employee_number+' => 'Die Personalnummer muss innerhalb dieser Organisation eindeutig sein.',
'Class:Person/UniquenessRule:employee_number' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit der gleichen Personalnummer',
'Class:Person/UniquenessRule:name+' => 'Innerhalb einer Organisation muss der Name einer Person eindeutig sein',
'Class:Person/UniquenessRule:name' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit dem gleichen Namen',
));
//
@@ -1298,8 +1298,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Physische Geräte',
'Class:Brand/Attribute:physicaldevices_list+' => '',
'Class:Brand/UniquenessRule:name/Description' => 'Der Name muss eindeutig sein',
'Class:Brand/UniquenessRule:name/Error' => 'Diese Marke existiert bereits',
'Class:Brand/UniquenessRule:name+' => 'Der Name muss eindeutig sein',
'Class:Brand/UniquenessRule:name' => 'Diese Marke existiert bereits',
));
//
@@ -1353,8 +1353,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:Model/Attribute:type/Value:Phone+' => '',
'Class:Model/Attribute:physicaldevices_list' => 'Phyische Geräte',
'Class:Model/Attribute:physicaldevices_list+' => '',
'Class:Model/UniquenessRule:name_brand/Description' => 'Der Modellname der für eine Marke muss eindeutig sein',
'Class:Model/UniquenessRule:name_brand/Error' => 'Es existiert bereits ein Modell mit diesem Namen für diese Marke',
'Class:Model/UniquenessRule:name_brand+' => 'Der Modellname der für eine Marke muss eindeutig sein',
'Class:Model/UniquenessRule:name_brand' => 'Es existiert bereits ein Modell mit diesem Namen für diese Marke',
));
//

16
datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
View File

@@ -211,10 +211,10 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Picture',
'Class:Person/Attribute:picture+' => '',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name',
));
//
@@ -1306,8 +1306,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices',
'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique',
'Class:Brand/UniquenessRule:name' => 'This brand already exists',
));
//
@@ -1361,8 +1361,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone',
'Class:Model/Attribute:physicaldevices_list' => 'Physical devices',
'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand',
));
//

16
datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
View File

@@ -207,10 +207,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Person/Attribute:manager_id_friendlyname+' => 'Nombre del Jefe',
'Class:Person/Attribute:picture' => 'Fotografía',
'Class:Person/Attribute:picture+' => 'Fotografía',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1302,8 +1302,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Brand+' => 'Marca',
'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivo Físico',
'Class:Brand/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1357,8 +1357,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Teléfono',
'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo Físico',
'Class:Model/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
View File

@@ -203,11 +203,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Photo',
'Class:Person/Attribute:picture+' => '',
'Class:Person/UniquenessRule:employee_number/Description' => 'Le numéro d\'employé doit être unique dans l\'organisation',
'Class:Person/UniquenessRule:employee_number/Error' => 'il y a déjà une personne avec ce numéro d\'employé dans l\'organisation
'Class:Person/UniquenessRule:employee_number+' => 'Le numéro d\'employé doit être unique dans l\'organisation',
'Class:Person/UniquenessRule:employee_number' => 'il y a déjà une personne avec ce numéro d\'employé dans l\'organisation
\'$this->org_name$\'',
'Class:Person/UniquenessRule:name/Description' => 'Le nom de l\'employé devrait être unique dans l\'organisation',
'Class:Person/UniquenessRule:name/Error' => 'Il y a déjà une personne avec ce nom dans l\'organisation \'$this->org_name$\'',
'Class:Person/UniquenessRule:name+' => 'Le nom de l\'employé devrait être unique dans l\'organisation',
'Class:Person/UniquenessRule:name' => 'Il y a déjà une personne avec ce nom dans l\'organisation \'$this->org_name$\'',
));
//
@@ -1299,8 +1299,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Matériels',
'Class:Brand/Attribute:physicaldevices_list+' => '',
'Class:Brand/UniquenessRule:name/Description' => 'Le nom doit être unique',
'Class:Brand/UniquenessRule:name/Error' => 'cette marque existe déjà',
'Class:Brand/UniquenessRule:name+' => 'Le nom doit être unique',
'Class:Brand/UniquenessRule:name' => 'cette marque existe déjà',
));
//
@@ -1354,8 +1354,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Téléphone',
'Class:Model/Attribute:physicaldevices_list' => 'Matériels',
'Class:Model/Attribute:physicaldevices_list+' => '',
'Class:Model/UniquenessRule:name_brand/Description' => 'Le nom doit être unique dans une marque',
'Class:Model/UniquenessRule:name_brand/Error' => 'ce modèle existe déjà dans cette marque',
'Class:Model/UniquenessRule:name_brand+' => 'Le nom doit être unique dans une marque',
'Class:Model/UniquenessRule:name_brand' => 'ce modèle existe déjà dans cette marque',
));
//

16
datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php
View File

@@ -200,10 +200,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1295,8 +1295,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Brand+' => '~~',
'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1350,8 +1350,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
View File

@@ -200,10 +200,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1295,8 +1295,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Brand+' => '~~',
'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1350,8 +1350,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
View File

@@ -200,10 +200,10 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1295,8 +1295,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => '物理デバイス',
'Class:Brand/Attribute:physicaldevices_list+' => '',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1350,8 +1350,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:Model/Attribute:type/Value:Phone+' => '電話',
'Class:Model/Attribute:physicaldevices_list' => '物理デバイス',
'Class:Model/Attribute:physicaldevices_list+' => '',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
View File

@@ -209,10 +209,10 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1304,8 +1304,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Fysieke apparaten',
'Class:Brand/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten die corresponderen met dit merk',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1359,8 +1359,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
'Class:Model/Attribute:physicaldevices_list' => 'Physical devices',
'Class:Model/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten die corresponderen met dit model',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
View File

@@ -206,10 +206,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1301,8 +1301,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivos físicos',
'Class:Brand/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a essa fabricante',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1356,8 +1356,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telefone',
'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo físico',
'Class:Model/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a esse modelo',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

12
datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php
View File

@@ -193,10 +193,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '',
'Class:Person/Attribute:picture' => 'Фотография',
'Class:Person/Attribute:picture+' => '',
'Class:Person/UniquenessRule:employee_number/Description' => 'Номер сотрудника должен быть уникальным в организации',
'Class:Person/UniquenessRule:employee_number/Error' => 'В организации \'$this->org_name$\' уже есть персона с таким номером сотрудника',
'Class:Person/UniquenessRule:name/Description' => 'Имя сотрудника должно быть уникальным внутри организации',
'Class:Person/UniquenessRule:name/Error' => 'В организации \'$this->org_name$\' уже есть персона с таким именем',
'Class:Person/UniquenessRule:employee_number+' => 'Номер сотрудника должен быть уникальным в организации',
'Class:Person/UniquenessRule:employee_number' => 'В организации \'$this->org_name$\' уже есть персона с таким номером сотрудника',
'Class:Person/UniquenessRule:name+' => 'Имя сотрудника должно быть уникальным внутри организации',
'Class:Person/UniquenessRule:name' => 'В организации \'$this->org_name$\' уже есть персона с таким именем',
));
//
@@ -1288,8 +1288,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Class:Brand+' => '',
'Class:Brand/Attribute:physicaldevices_list' => 'Устройства',
'Class:Brand/Attribute:physicaldevices_list+' => 'Все устройства этого бренда',
'Class:Brand/UniquenessRule:name/Description' => 'Название должно быть уникальным',
'Class:Brand/UniquenessRule:name/Error' => 'Этот бренд уже существует',
'Class:Brand/UniquenessRule:name+' => 'Название должно быть уникальным',
'Class:Brand/UniquenessRule:name' => 'Этот бренд уже существует',
));
//

16
datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
View File

@@ -207,10 +207,10 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1302,8 +1302,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Brand+' => '~~',
'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1357,8 +1357,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

16
datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
View File

@@ -207,10 +207,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
'Class:Person/Attribute:picture' => 'Picture~~',
'Class:Person/Attribute:picture+' => '~~',
'Class:Person/UniquenessRule:employee_number/Description' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number/Error' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name/Description' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name/Error' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
));
//
@@ -1302,8 +1302,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Brand+' => '~~',
'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
'Class:Brand/UniquenessRule:name/Description' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name/Error' => 'This brand already exists~~',
'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
));
//
@@ -1357,8 +1357,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
'Class:Model/UniquenessRule:name_brand/Description' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand/Error' => 'this model already exists for this brand~~',
'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
));
//

2
setup/compiler.class.inc.php
View File

@@ -1149,8 +1149,6 @@ EOF
$aUniquenessRules[$sCurrentRuleId]['disabled'] = $this->GetPropBooleanConverted($oUniquenessSingleRule, 'disabled', null);
$aUniquenessRules[$sCurrentRuleId]['is_blocking'] = $this->GetPropBooleanConverted($oUniquenessSingleRule, 'is_blocking',
null);
$aUniquenessRules[$sCurrentRuleId]['description'] = $oUniquenessSingleRule->GetChildText('description');
$aUniquenessRules[$sCurrentRuleId]['error_message'] = $oUniquenessSingleRule->GetChildText('error_message');
try
{