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

Updated data model dictionary + a few adjustments in the data model + quick fix in the setup

Browse Source 
SVN:trunk[498]
This commit is contained in:
Romain Quetiez
2010-06-28 15:22:51 +00:00
parent 95dc9bfc1a
commit b178cc4620
4 changed files with 536 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
business/itop.business.class.inc.php
View File

@@ -442,7 +442,7 @@ class lnkPatchToCI extends cmdbAbstractObject
{
$aParams = array
(
"category" => "bizmodel,searchable,configmgmt",
"category" => "bizmodel,configmgmt",
"key_type" => "autoincrement",
"name_attcode" => "patch_id",
"state_attcode" => "",
@@ -491,8 +491,10 @@ abstract class FunctionalCI extends cmdbAbstractObject
MetaModel::Init_AddAttribute(new AttributeExternalKey("owner_id", array("targetclass"=>"Organization", "jointype"=>null, "allowed_values"=>null, "sql"=>"owner_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalField("owner_name", array("allowed_values"=>null, "extkey_attcode"=>"owner_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,medium,high'), "sql"=>"importance", "default_value"=>"medium", "is_null_allowed"=>false, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("solution_list", array("linked_class"=>"lnkSolutionToCI", "ext_key_to_me"=>"ci_id", "ext_key_to_remote"=>"solution_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance'));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'solution_list'));
MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance'));
MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance'));
MetaModel::Init_SetZListItems('list', array('name', 'status', 'owner_id', 'importance'));
@@ -587,8 +589,9 @@ class ApplicationSolution extends FunctionalCI
MetaModel::Init_AddAttribute(new AttributeWikiText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("ci_list", array("linked_class"=>"lnkSolutionToCI", "ext_key_to_me"=>"solution_id", "ext_key_to_remote"=>"ci_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("process_list", array("linked_class"=>"lnkProcessToSolution", "ext_key_to_me"=>"solution_id", "ext_key_to_remote"=>"process_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'description', 'ci_list'));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'description', 'ci_list', 'process_list'));
MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'description'));
MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'description'));
MetaModel::Init_SetZListItems('list', array('name', 'status', 'owner_id', 'importance', 'description'));
@@ -713,8 +716,9 @@ class Device extends ConnectableCI
MetaModel::Init_Params($aParams);
MetaModel::Init_InheritAttributes();
//MetaModel::Init_AddAttribute(new AttributeLinkedSet("application_list", array("linked_class"=>"ApplicationInstance", "ext_key_to_me"=>"device_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref'));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'application_list'));
MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref'));
MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref'));
MetaModel::Init_SetZListItems('list', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref'));
@@ -741,7 +745,7 @@ class PC extends Device
MetaModel::Init_InheritAttributes();
MetaModel::Init_AddAttribute(new AttributeString("cpu", array("allowed_values"=>null, "sql"=>"cpu", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeInteger("ram", array("allowed_values"=>null, "sql"=>"ram", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("ram", array("allowed_values"=>null, "sql"=>"ram", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("hdd", array("allowed_values"=>null, "sql"=>"hdd", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("os_family", array("allowed_values"=>null, "sql"=>"os_family", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("os_version", array("allowed_values"=>null, "sql"=>"os_version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -800,13 +804,13 @@ class MobilePhone extends MobileCI
MetaModel::Init_InheritAttributes();
MetaModel::Init_AddAttribute(new AttributeString("number", array("allowed_values"=>null, "sql"=>"number", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("IMIE", array("allowed_values"=>null, "sql"=>"IMIE", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("imei", array("allowed_values"=>null, "sql"=>"IMIE", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributePassword("hw_pin", array("allowed_values"=>null, "sql"=>"hw_pin", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'IMIE', 'hw_pin'));
MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'IMIE', 'hw_pin'));
MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'IMIE', 'hw_pin'));
MetaModel::Init_SetZListItems('list', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'IMIE', 'hw_pin'));
MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'imei', 'hw_pin'));
MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'imei'));
MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'imei'));
MetaModel::Init_SetZListItems('list', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'number', 'imei', 'hw_pin'));
}
}
class InfrastructureCI extends Device
@@ -864,7 +868,7 @@ class NetworkDevice extends InfrastructureCI
MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('WANaccelerator,firewall,hub,loadbalancer,router,switch'), "sql"=>"type", "default_value"=>"switch", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("ios_version", array("allowed_values"=>null, "sql"=>"ios_version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeInteger("ram", array("allowed_values"=>null, "sql"=>"ram", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("ram", array("allowed_values"=>null, "sql"=>"ram", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributePassword("snmp_read", array("allowed_values"=>null, "sql"=>"snmp_read", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributePassword("snmp_write", array("allowed_values"=>null, "sql"=>"snmp_write", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -895,8 +899,8 @@ class Server extends InfrastructureCI
MetaModel::Init_InheritAttributes();
MetaModel::Init_AddAttribute(new AttributeString("cpu", array("allowed_values"=>null, "sql"=>"cpu", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeInteger("ram", array("allowed_values"=>null, "sql"=>"ram", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeInteger("hdd", array("allowed_values"=>null, "sql"=>"hdd", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("ram", array("allowed_values"=>null, "sql"=>"ram", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("hdd", array("allowed_values"=>null, "sql"=>"hdd", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("os_family", array("allowed_values"=>null, "sql"=>"os_family", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("os_version", array("allowed_values"=>null, "sql"=>"os_version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -942,7 +946,7 @@ class lnkCItoDoc extends cmdbAbstractObject
{
$aParams = array
(
"category" => "bizmodel,searchable,configmgmt",
"category" => "bizmodel,configmgmt",
"key_type" => "autoincrement",
"name_attcode" => "ci_id",
"state_attcode" => "",
@@ -973,7 +977,7 @@ class lnkCIToContact extends cmdbAbstractObject
{
$aParams = array
(
"category" => "bizmodel,searchable,configmgmt",
"category" => "bizmodel,configmgmt",
"key_type" => "autoincrement",
"name_attcode" => "ci_id",
"state_attcode" => "",
@@ -990,11 +994,12 @@ class lnkCIToContact extends cmdbAbstractObject
MetaModel::Init_AddAttribute(new AttributeExternalField("ci_name", array("allowed_values"=>null, "extkey_attcode"=>"ci_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalKey("contact_id", array("targetclass"=>"Contact", "jointype"=>null, "allowed_values"=>null, "sql"=>"contact_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalField("contact_name", array("allowed_values"=>null, "extkey_attcode"=>"contact_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('ci_id', 'contact_id'));
MetaModel::Init_SetZListItems('advanced_search', array('ci_id', 'contact_id'));
MetaModel::Init_SetZListItems('standard_search', array('ci_id', 'contact_id'));
MetaModel::Init_SetZListItems('list', array('ci_id', 'contact_id'));
MetaModel::Init_SetZListItems('details', array('ci_id', 'contact_id', 'role'));
MetaModel::Init_SetZListItems('advanced_search', array('ci_id', 'contact_id', 'role'));
MetaModel::Init_SetZListItems('standard_search', array('ci_id', 'contact_id', 'role'));
MetaModel::Init_SetZListItems('list', array('ci_id', 'contact_id', 'role'));
}
}
class lnkSolutionToCI extends cmdbAbstractObject
@@ -1004,7 +1009,7 @@ class lnkSolutionToCI extends cmdbAbstractObject
{
$aParams = array
(
"category" => "bizmodel,searchable,configmgmt",
"category" => "bizmodel,configmgmt",
"key_type" => "autoincrement",
"name_attcode" => "solution_id",
"state_attcode" => "",
@@ -1021,11 +1026,12 @@ class lnkSolutionToCI extends cmdbAbstractObject
MetaModel::Init_AddAttribute(new AttributeExternalField("solution_name", array("allowed_values"=>null, "extkey_attcode"=>"solution_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalKey("ci_id", array("targetclass"=>"FunctionalCI", "jointype"=>null, "allowed_values"=>null, "sql"=>"ci_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalField("ci_name", array("allowed_values"=>null, "extkey_attcode"=>"ci_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("utility", array("allowed_values"=>null, "sql"=>"utility", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('solution_id', 'ci_id'));
MetaModel::Init_SetZListItems('advanced_search', array('solution_id', 'ci_id'));
MetaModel::Init_SetZListItems('standard_search', array('solution_id', 'ci_id'));
MetaModel::Init_SetZListItems('list', array('solution_id', 'ci_id'));
MetaModel::Init_SetZListItems('details', array('solution_id', 'ci_id', 'utility'));
MetaModel::Init_SetZListItems('advanced_search', array('solution_id', 'ci_id', 'utility'));
MetaModel::Init_SetZListItems('standard_search', array('solution_id', 'ci_id', 'utility'));
MetaModel::Init_SetZListItems('list', array('solution_id', 'ci_id', 'utility'));
}
}
class lnkProcessToSolution extends cmdbAbstractObject
@@ -1035,7 +1041,7 @@ class lnkProcessToSolution extends cmdbAbstractObject
{
$aParams = array
(
"category" => "bizmodel,searchable,configmgmt",
"category" => "bizmodel,configmgmt",
"key_type" => "autoincrement",
"name_attcode" => "solution_id",
"state_attcode" => "",
@@ -1051,14 +1057,17 @@ class lnkProcessToSolution extends cmdbAbstractObject
MetaModel::Init_AddAttribute(new AttributeExternalKey("solution_id", array("targetclass"=>"ApplicationSolution", "jointype"=>null, "allowed_values"=>null, "sql"=>"solution_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalField("solution_name", array("allowed_values"=>null, "extkey_attcode"=>"solution_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalKey("process_id", array("targetclass"=>"BusinessProcess", "jointype"=>null, "allowed_values"=>null, "sql"=>"process_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalField("ci_name", array("allowed_values"=>null, "extkey_attcode"=>"process_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeExternalField("process_name", array("allowed_values"=>null, "extkey_attcode"=>"process_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"reason", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_SetZListItems('details', array('solution_id', 'process_id'));
MetaModel::Init_SetZListItems('advanced_search', array('solution_id', 'process_id'));
MetaModel::Init_SetZListItems('standard_search', array('solution_id', 'process_id'));
MetaModel::Init_SetZListItems('list', array('solution_id', 'process_id'));
MetaModel::Init_SetZListItems('details', array('solution_id', 'process_id', 'reason'));
MetaModel::Init_SetZListItems('advanced_search', array('solution_id', 'process_id', 'reason'));
MetaModel::Init_SetZListItems('standard_search', array('solution_id', 'process_id', 'reason'));
MetaModel::Init_SetZListItems('list', array('solution_id', 'process_id', 'reason'));
}
}
class Contract extends cmdbAbstractObject
{
@@ -1079,7 +1088,7 @@ class Contract extends cmdbAbstractObject
MetaModel::Init_Params($aParams);
MetaModel::Init_InheritAttributes();
MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum(''), "sql"=>"status", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
MetaModel::Init_AddAttribute(new AttributeDate("signed", array("allowed_values"=>null, "sql"=>"signed", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
@@ -1792,6 +1801,7 @@ class lnkKnownErrorToProblem extends cmdbAbstractObject
MetaModel::Init_SetZListItems('list', array('foo'));
}
}
//////////////////////////////////////////////////////////////////////////////
// Menu:
// +----------------------------------------+

1
core/attributedef.class.inc.php
View File

@@ -774,6 +774,7 @@ class AttributePassword extends AttributeString
public function GetFilterDefinitions()
{
// Note: due to this, you will get an error if a password is being declared as a search criteria (see ZLists)
// not allowed to search on passwords!
return array();
}

1659
dictionaries/dictionary.itop.model.php
View File

File diff suppressed because it is too large Load Diff

14
setup/data/structure/23.triggers.xml
View File

@@ -1,17 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<Set>
<TriggerOnObjectCreate id="2">
<description>Incident Creation</description>
<target_class>Incident</target_class>
</TriggerOnObjectCreate>
<TriggerOnStateEnter id="5">
<description>Incident ticket assigned to agent</description>
<target_class>Incident</target_class>
<state>Assigned</state>
</TriggerOnStateEnter>
<TriggerOnStateEnter id="6">
<description>Incident ticket resolved</description>
<target_class>Incident</target_class>
<state>Resolved</state>
</TriggerOnStateEnter>
</Set>