composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Data model finalization... renamed ElectricalConnection to PowerConnection and Arrival to PowerSource

Browse Source 
- Changes in the default choices for the setup

SVN:trunk[2364]
This commit is contained in:
Denis Flaven
2012-10-25 14:47:54 +00:00
parent d73405d1f4
commit a57e5e0af4
6 changed files with 100 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/installation.xml
View File

@@ -19,10 +19,11 @@
</choice>
<choice>
<title>Data Center Devices</title>
<description>Manage Data Center devices such as racks, enclosures, etc.</description>
<description>Manage Data Center devices such as Racks, Enclosures, PDUs, etc.</description>
<modules type="array">
<module>itop-datacenter-mgmt</module>
</modules>
<default>true</default>
</choice>
<choice>
<title>End-User Devices</title>
@@ -30,6 +31,7 @@
<modules type="array">
<module>itop-endusers-devices</module>
</modules>
<default>true</default>
</choice>
<choice>
<title>Storage Devices</title>
@@ -37,6 +39,7 @@
<modules type="array">
<module>itop-storage-mgmt</module>
</modules>
<default>true</default>
</choice>
<choice>
<title>Virtualization</title>
@@ -44,6 +47,7 @@
<modules type="array">
<module>itop-virtualization-mgmt</module>
</modules>
<default>true</default>
</choice>
</options>
</step>
@@ -135,7 +139,6 @@
<modules type="array">
<module>itop-change-mgmt-itil</module>
</modules>
<default>false</default>
</choice>
<choice>
<title>None</title>
@@ -152,11 +155,10 @@
<options type="array">
<choice>
<title>Known Errors Management</title>
<description>Select this option to track "Known Errors" in iTop.</description>
<description>Select this option to track "Known Errors" and FAQs in iTop.</description>
<modules type="array">
<module>itop-knownerror-mgmt</module>
</modules>
<default>false</default>
</choice>
<choice>
<title>Problem Management</title>
@@ -164,7 +166,6 @@
<modules type="array">
<module>itop-problem-mgmt</module>
</modules>
<default>false</default>
</choice>
</options>
</step>

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

@@ -1938,12 +1938,12 @@
<is_null_allowed>true</is_null_allowed>
</field>
<field id="powerA_id" xsi:type="AttributeExternalKey">
<filter><![CDATA[SELECT ElectricalConnection WHERE location_id= :this->location_id]]></filter>
<filter><![CDATA[SELECT PowerConnection WHERE location_id= :this->location_id]]></filter>
<dependencies>
<attribute id="location_id"/>
</dependencies>
<sql>powera_id</sql>
<target_class>ElectricalConnection</target_class>
<target_class>PowerConnection</target_class>
<is_null_allowed>true</is_null_allowed>
<on_target_delete>DEL_MANUAL</on_target_delete>
</field>
@@ -1952,12 +1952,12 @@
<target_attcode>name</target_attcode>
</field>
<field id="powerB_id" xsi:type="AttributeExternalKey">
<filter><![CDATA[SELECT ElectricalConnection WHERE location_id= :this->location_id]]></filter>
<filter><![CDATA[SELECT PowerConnection WHERE location_id= :this->location_id]]></filter>
<dependencies>
<attribute id="location_id"/>
</dependencies>
<sql>powerB_id</sql>
<target_class>ElectricalConnection</target_class>
<target_class>PowerConnection</target_class>
<is_null_allowed>true</is_null_allowed>
<on_target_delete>DEL_MANUAL</on_target_delete>
</field>
@@ -5648,7 +5648,7 @@
<value>TapeLibrary</value>
<value>IpPhone</value>
<value>Peripheral</value>
<value>Arrival</value>
<value>PowerSource</value>
<value>PDU</value>
</values>
<sql>type</sql>
@@ -7800,10 +7800,61 @@
<oql>SELECT Group</oql>
<do_search>1</do_search>
</menu>
<menu id="Typology" xsi:type="TemplateMenuNode" _delta="define">
<rank>80</rank>
<parent>Catalogs</parent>
<template_file>typology_menu.html</template_file>
</menu>
<menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
<rank>80</rank>
<parent>Catalogs</parent>
<definition>
<layout>DashboardLayoutOneCol</layout>
<title>Menu:ConfigManagement:Typology</title>
<cells>
<cell id="0">
<rank>0</rank>
<dashlets>
<dashlet id="1" xsi:type="DashletHeaderStatic">
<rank>0</rank>
<title>Menu:ConfigManagement:Typology</title>
<icon>itop-config-mgmt/images/typology.png</icon>
</dashlet>
<dashlet id="2" xsi:type="DashletBadge">
<rank>1</rank>
<class>Brand</class>
</dashlet>
<dashlet id="3" xsi:type="DashletBadge">
<rank>2</rank>
<class>Model</class>
</dashlet>
<dashlet id="4" xsi:type="DashletBadge">
<rank>3</rank>
<class>OSfamily</class>
</dashlet>
<dashlet id="5" xsi:type="DashletBadge">
<rank>4</rank>
<class>OSversion</class>
</dashlet>
<dashlet id="6" xsi:type="DashletBadge">
<rank>5</rank>
<class>IOSversion</class>
</dashlet>
<dashlet id="7" xsi:type="DashletBadge">
<rank>6</rank>
<class>NetworkDeviceType</class>
</dashlet>
<dashlet id="8" xsi:type="DashletBadge">
<rank>7</rank>
<class>ContractType</class>
</dashlet>
<dashlet id="9" xsi:type="DashletBadge">
<rank>8</rank>
<class>ContactType</class>
</dashlet>
<dashlet id="10" xsi:type="DashletBadge">
<rank>9</rank>
<class>DocumentType</class>
</dashlet>
</dashlets>
</cell>
</cells>
</definition>
</menu>
</menus>
</itop_design>

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

@@ -468,7 +468,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:DatacenterDevice/Attribute:powerA_id+' => '',
'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name',
'Class:DatacenterDevice/Attribute:powerA_name+' => '',
'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB',
'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source',
'Class:DatacenterDevice/Attribute:powerB_id+' => '',
'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name',
'Class:DatacenterDevice/Attribute:powerB_name+' => '',
@@ -607,23 +607,23 @@ Dict::Add('EN US', 'English', 'English', array(
));
//
// Class: ElectricalConnection
// Class: PowerConnection
//
Dict::Add('EN US', 'English', 'English', array(
'Class:ElectricalConnection' => 'Electrical Connection',
'Class:ElectricalConnection+' => '',
'Class:PowerConnection' => 'Power Connection',
'Class:PowerConnection+' => '',
));
//
// Class: Arrival
// Class: PowerSource
//
Dict::Add('EN US', 'English', 'English', array(
'Class:Arrival' => 'Arrival',
'Class:Arrival+' => '',
'Class:Arrival/Attribute:pdus_list' => 'PDUs',
'Class:Arrival/Attribute:pdus_list+' => '',
'Class:PowerSource' => 'Power Source',
'Class:PowerSource+' => '',
'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
'Class:PowerSource/Attribute:pdus_list+' => '',
));
//
@@ -1280,10 +1280,10 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Model/Attribute:brand_name+' => '',
'Class:Model/Attribute:Type' => 'Device type',
'Class:Model/Attribute:Type+' => '',
'Class:Model/Attribute:Type/Value:Arrival' => 'Arrival',
'Class:Model/Attribute:Type/Value:Arrival+' => 'Arrival',
'Class:Model/Attribute:Type/Value:DiskArray' => 'DiskArray',
'Class:Model/Attribute:Type/Value:DiskArray+' => 'DiskArray',
'Class:Model/Attribute:Type/Value:PowerSource' => 'Power Source',
'Class:Model/Attribute:Type/Value:PowerSource+' => 'Power Source',
'Class:Model/Attribute:Type/Value:DiskArray' => 'Disk Array',
'Class:Model/Attribute:Type/Value:DiskArray+' => 'Disk Array',
'Class:Model/Attribute:Type/Value:Enclosure' => 'Enclosure',
'Class:Model/Attribute:Type/Value:Enclosure+' => 'Enclosure',
'Class:Model/Attribute:Type/Value:IpPhone' => 'Ip Phone',

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

@@ -558,23 +558,23 @@ Dict::Add('FR FR', 'French', 'Français', array(
));
//
// Class: ElectricalConnection
// Class: PowerConnection
//
Dict::Add('FR FR', 'French', 'Français', array(
'Class:ElectricalConnection' => 'Connection Electrique',
'Class:ElectricalConnection+' => '',
'Class:PowerConnection' => 'Connection Electrique',
'Class:PowerConnection+' => '',
));
//
// Class: Arrival
// Class: PowerSource
//
Dict::Add('FR FR', 'French', 'Français', array(
'Class:Arrival' => 'Arrivée électrique',
'Class:Arrival+' => '',
'Class:Arrival/Attribute:pdus_list' => 'PDUs',
'Class:Arrival/Attribute:pdus_list+' => '',
'Class:PowerSource' => 'Arrivée électrique',
'Class:PowerSource+' => '',
'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
'Class:PowerSourcel/Attribute:pdus_list+' => '',
));
//
@@ -1231,8 +1231,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Model/Attribute:brand_name+' => '',
'Class:Model/Attribute:Type' => 'Type de matériel',
'Class:Model/Attribute:Type+' => '',
'Class:Model/Attribute:Type/Value:Arrival' => 'Arrivée électrique',
'Class:Model/Attribute:Type/Value:Arrival+' => 'Arrivée électrique',
'Class:Model/Attribute:Type/Value:PowerSource' => 'Arrivée électrique',
'Class:Model/Attribute:Type/Value:PowerSource+' => 'Arrivée électrique',
'Class:Model/Attribute:Type/Value:Enclosure' => 'Chassis',
'Class:Model/Attribute:Type/Value:Enclosure+' => 'Chassis',
'Class:Model/Attribute:Type/Value:IpPhone' => 'Téléphone IP',

18
datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
View File

@@ -389,13 +389,13 @@
</list>
</presentation>
</class>
<class id="ElectricalConnection" _delta="define">
<class id="PowerConnection" _delta="define">
<parent>PhysicalDevice</parent>
<properties>
<category>bizmodel,searchable</category>
<abstract>true</abstract>
<key_type>autoincrement</key_type>
<db_table>electricalconnection</db_table>
<db_table>powerconnection</db_table>
<db_key_field>id</db_key_field>
<db_final_class_field/>
<naming>
@@ -573,13 +573,13 @@
</list>
</presentation>
</class>
<class id="Arrival" _delta="define">
<parent>ElectricalConnection</parent>
<class id="PowerSource" _delta="define">
<parent>PowerConnection</parent>
<properties>
<category>bizmodel,searchable</category>
<abstract>false</abstract>
<key_type>autoincrement</key_type>
<db_table>arrival</db_table>
<db_table>powersource</db_table>
<db_key_field>id</db_key_field>
<db_final_class_field/>
<naming>
@@ -738,7 +738,7 @@
</presentation>
</class>
<class id="PDU" _delta="define">
<parent>ElectricalConnection</parent>
<parent>PowerConnection</parent>
<properties>
<category>bizmodel,searchable</category>
<abstract>false</abstract>
@@ -774,12 +774,12 @@
<target_attcode>name</target_attcode>
</field>
<field id="powerstart_id" xsi:type="AttributeExternalKey">
<filter><![CDATA[SELECT ElectricalConnection WHERE id != :this->id AND location_id = :this->location_id]]></filter>
<filter><![CDATA[SELECT PowerConnection WHERE id != :this->id AND location_id = :this->location_id]]></filter>
<dependencies>
<attribute id="location_id"/>
</dependencies>
<sql>powerstart_id</sql>
<target_class>ElectricalConnection</target_class>
<target_class>PowerConnection</target_class>
<is_null_allowed>true</is_null_allowed>
<on_target_delete>DEL_MANUAL</on_target_delete>
</field>
@@ -941,7 +941,7 @@
</dashlet>
<dashlet id="10" xsi:type="DashletBadge" _delta="define">
<rank>9</rank>
<class>ElectricalConnection</class>
<class>PowerConnection</class>
</dashlet>
</dashlets>
</cell>

2
datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
View File

@@ -5,7 +5,7 @@
<parent>PhysicalDevice</parent>
<properties>
<category>bizmodel,searchable</category>
<abstract>false</abstract>
<abstract>true</abstract>
<key_type>autoincrement</key_type>
<db_table>telephonyci</db_table>
<db_key_field>id</db_key_field>