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

DataModel: obsolescence conditions: Added: Contact, Location, Org. Modified: Hypervisor, Ticket

Browse Source 
SVN:trunk[4802]
This commit is contained in:
Vincent Dumas
2017-07-06 14:54:20 +00:00
parent 98781fac6d
commit bc476295cb
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
<comment><![CDATA[/**
* Persistent classes for a CMDB
*
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @copyright Copyright (C) 2010-2017 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/]]></comment>
<category>bizmodel,searchable,structure</category>
@@ -29,6 +29,9 @@
<attribute id="code"/>
</attributes>
</reconciliation>
<obsolescence>
<condition>status='inactive'</condition>
</obsolescence>
</properties>
<fields>
<field id="name" xsi:type="AttributeString">
@@ -133,6 +136,9 @@
<attribute id="org_name"/>
</attributes>
</reconciliation>
<obsolescence>
<condition>status='inactive'</condition>
</obsolescence>
</properties>
<fields>
<field id="name" xsi:type="AttributeString">
@@ -296,6 +302,9 @@
<attribute id="finalclass"/>
</attributes>
</reconciliation>
<obsolescence>
<condition>status='inactive'</condition>
</obsolescence>
</properties>
<fields>
<field id="name" xsi:type="AttributeString">

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

@@ -281,10 +281,10 @@
<attribute id="server_id"/>
<attribute id="farm_id"/>
</attributes>
<obsolescence>
<condition>(ISNULL(server_id)=0 AND server_id_obsolescence_flag) OR status='obsolete'</condition>
</obsolescence>
</reconciliation>
<obsolescence>
<condition><![CDATA[status='obsolete' OR (server_id!=0 AND server_id_obsolescence_flag)]]></condition>
</obsolescence>
</properties>
<fields>
<field id="farm_id" xsi:type="AttributeExternalKey">
@@ -578,7 +578,7 @@
</attributes>
</reconciliation>
<obsolescence>
<condition>status='obsolete' OR virtualhost_id_obsolescence_flag</condition>
<condition><![CDATA[status='obsolete' OR virtualhost_id_obsolescence_flag]]></condition>
</obsolescence>
</properties>
<fields>

4
datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
View File

@@ -33,8 +33,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
'Menu:DataModelMenu' => 'Modèle de Données',
'Menu:DataModelMenu+' => 'Résumé du Modèle de Données',
'Menu:ExportMenu' => 'Exportation',
'Menu:ExportMenu+' => 'Exportation des résultats d\'une requête en HTML, CSV ou XML',
'Menu:ExportMenu' => 'Export',
'Menu:ExportMenu+' => 'Export des résultats d\'une requête en HTML, CSV ou XML',
'Menu:NotificationsMenu' => 'Notifications',
'Menu:NotificationsMenu+' => 'Configuration des Notifications',
'Menu:AuditCategories' => 'Catégories d\'audit',