From 2e07f731227803629fa3a623e3c72b39eca6a940 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Fri, 14 May 2010 10:06:07 +0000 Subject: [PATCH] #112 Implicit search filter declaration SVN:trunk[404] --- .../userrights/userrightsmatrix.class.inc.php | 23 --- .../userrightsprofile.class.inc.php | 49 ------ application/audit.category.class.inc.php | 4 - application/audit.rule.class.inc.php | 7 - application/iotask.class.inc.php | 7 - application/menunode.class.inc.php | 6 - business/ChangeMgmt.business.php | 30 ---- business/KEDB.business.php | 30 +--- business/ServiceDesk.business.php | 44 ++--- business/ServiceMgmt.business.php | 51 +----- business/ServiceRequest.business.php | 43 ++--- business/business_itopbegins.class.inc.php | 19 -- business/business_test.class.inc.php | 17 -- business/incidentMgmt.business.php | 31 ---- business/itop.business.class.inc.php | 165 +----------------- business/test_farm.class.inc.php | 34 ---- core/action.class.inc.php | 8 - core/attributedef.class.inc.php | 34 +++- core/cmdbchange.class.inc.php | 4 - core/cmdbchangeop.class.inc.php | 20 --- core/event.class.inc.php | 16 -- core/metamodel.class.php | 101 ++--------- core/trigger.class.inc.php | 19 -- 23 files changed, 92 insertions(+), 670 deletions(-) diff --git a/addons/userrights/userrightsmatrix.class.inc.php b/addons/userrights/userrightsmatrix.class.inc.php index 8dc336764..09d78cb00 100644 --- a/addons/userrights/userrightsmatrix.class.inc.php +++ b/addons/userrights/userrightsmatrix.class.inc.php @@ -35,10 +35,6 @@ class UserRightsMatrixUsers extends DBObject MetaModel::Init_AddAttribute(new AttributeInteger("userid", array("allowed_values"=>null, "sql"=>"userid", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("login", array("allowed_values"=>null, "sql"=>"login", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("password", array("allowed_values"=>null, "sql"=>"pwd", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("userid"); - MetaModel::Init_AddFilterFromAttribute("login"); } } @@ -66,12 +62,6 @@ class UserRightsMatrixClassGrant extends DBObject MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("userid"); - MetaModel::Init_AddFilterFromAttribute("login"); - MetaModel::Init_AddFilterFromAttribute("class"); - MetaModel::Init_AddFilterFromAttribute("action"); } } @@ -99,12 +89,6 @@ class UserRightsMatrixClassStimulusGrant extends DBObject MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("userid"); - MetaModel::Init_AddFilterFromAttribute("login"); - MetaModel::Init_AddFilterFromAttribute("class"); - MetaModel::Init_AddFilterFromAttribute("stimulus"); } } @@ -133,13 +117,6 @@ class UserRightsMatrixAttributeGrant extends DBObject MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("userid"); - MetaModel::Init_AddFilterFromAttribute("login"); - MetaModel::Init_AddFilterFromAttribute("class"); - MetaModel::Init_AddFilterFromAttribute("attcode"); - MetaModel::Init_AddFilterFromAttribute("action"); } } diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index 8fc14e81e..049b559a6 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -72,11 +72,6 @@ class URP_Users extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profiles", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"profileid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("userid"); - MetaModel::Init_AddFilterFromAttribute("login"); - MetaModel::Init_AddFilterFromAttribute("password"); - // Display lists MetaModel::Init_SetZListItems('details', array('userid', 'first_name', 'email', 'login', 'language')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login')); // Attributes to be displayed for a list @@ -199,10 +194,6 @@ class URP_Profiles extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("users", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("description"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'description')); // Attributes to be displayed for a list @@ -309,11 +300,6 @@ class URP_Dimensions extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeClass("type", array("class_category"=>"bizmodel", "more_values"=>"String,Integer", "sql"=>"type", "default_value"=>'String', "is_null_allowed"=>false, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("description"); - MetaModel::Init_AddFilterFromAttribute("type"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'type')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'description')); // Attributes to be displayed for a list @@ -432,10 +418,6 @@ class URP_UserProfile extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("userid"); - MetaModel::Init_AddFilterFromAttribute("profileid"); - // Display lists MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list @@ -479,10 +461,6 @@ class URP_ProfileProjection extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("dimensionid"); - MetaModel::Init_AddFilterFromAttribute("profileid"); - // Display lists MetaModel::Init_SetZListItems('details', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for a list @@ -556,11 +534,6 @@ class URP_ClassProjection extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("dimensionid"); - // #@# verifier - MetaModel::Init_AddFilterFromAttribute("class"); - // Display lists MetaModel::Init_SetZListItems('details', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for a list @@ -639,15 +612,6 @@ class URP_ActionGrant extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - // Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked) - MetaModel::Init_AddFilterFromAttribute("profileid"); - MetaModel::Init_AddFilterFromAttribute("profile"); - MetaModel::Init_AddFilterFromAttribute("class"); - MetaModel::Init_AddFilterFromAttribute("permission"); - - MetaModel::Init_AddFilterFromAttribute("action"); - // Display lists MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for a list @@ -686,15 +650,6 @@ class URP_StimulusGrant extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - // Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked) - MetaModel::Init_AddFilterFromAttribute("profileid"); - MetaModel::Init_AddFilterFromAttribute("profile"); - MetaModel::Init_AddFilterFromAttribute("class"); - MetaModel::Init_AddFilterFromAttribute("permission"); - - MetaModel::Init_AddFilterFromAttribute("stimulus"); - // Display lists MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for a list @@ -728,10 +683,6 @@ class URP_AttributeGrant extends UserRightsBaseClass MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("actiongrantid"); - MetaModel::Init_AddFilterFromAttribute("attcode"); - // Display lists MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('actiongrantid', 'attcode')); // Attributes to be displayed for a list diff --git a/application/audit.category.class.inc.php b/application/audit.category.class.inc.php index 3a96411c0..14e04b590 100644 --- a/application/audit.category.class.inc.php +++ b/application/audit.category.class.inc.php @@ -28,10 +28,6 @@ class AuditCategory extends cmdbAbstractObject 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 AttributeText("definition_set", array("allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("description"); - MetaModel::Init_AddFilterFromAttribute("definition_set"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'description', )); // Attributes to be displayed for a list diff --git a/application/audit.rule.class.inc.php b/application/audit.rule.class.inc.php index 1e66d0a0d..d34345177 100644 --- a/application/audit.rule.class.inc.php +++ b/application/audit.rule.class.inc.php @@ -32,13 +32,6 @@ class AuditRule extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values"=>null, "sql"=>"category_id", "targetclass"=>"AuditCategory", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values"=>null, "extkey_attcode"=> 'category_id', "target_attcode"=>"name"))); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("description"); - MetaModel::Init_AddFilterFromAttribute("query"); - MetaModel::Init_AddFilterFromAttribute("valid_flag"); - MetaModel::Init_AddFilterFromAttribute("category_id"); - MetaModel::Init_AddFilterFromAttribute("category_name"); - // Display lists MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('category_id', 'name', 'description', 'valid_flag')); // Attributes to be displayed for a list diff --git a/application/iotask.class.inc.php b/application/iotask.class.inc.php index 7314ccf5a..06a9c0022 100644 --- a/application/iotask.class.inc.php +++ b/application/iotask.class.inc.php @@ -34,13 +34,6 @@ class InputOutputTask extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("description"); - MetaModel::Init_AddFilterFromAttribute("category"); - MetaModel::Init_AddFilterFromAttribute("source_type"); - MetaModel::Init_AddFilterFromAttribute("source_subtype"); - MetaModel::Init_AddFilterFromAttribute("objects_class"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index db4a05f62..71a9d85b7 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -46,12 +46,6 @@ class menuNode extends DBObject MetaModel::Init_AddAttribute(new AttributeExternalField("parent_name", array("allowed_values"=>null, "extkey_attcode"=>"parent_id", "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeInteger("user_id", array("allowed_values"=>null, "sql"=>"user_id", "default_value" => 0, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("label"); - MetaModel::Init_AddFilterFromAttribute("parent_id"); - MetaModel::Init_AddFilterFromAttribute("rank"); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("user_id"); - MetaModel::Init_SetZListItems('details', array('parent_id', 'name', 'label', 'hyperlink', 'template', 'rank', 'type')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('parent_id', 'name', 'label', 'rank', 'type')); // Attributes to be displayed for a list } diff --git a/business/ChangeMgmt.business.php b/business/ChangeMgmt.business.php index f2afe2287..40708a2eb 100644 --- a/business/ChangeMgmt.business.php +++ b/business/ChangeMgmt.business.php @@ -70,30 +70,6 @@ class bizChangeTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("impacted_infra_manual", array("linked_class"=>"lnkInfraChangeTicket", "ext_key_to_me"=>"ticket_id", "ext_key_to_remote"=>"infra_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("title"); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("domain"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("requestor_id"); - MetaModel::Init_AddFilterFromAttribute("ticket_status"); - MetaModel::Init_AddFilterFromAttribute("creation_date"); - MetaModel::Init_AddFilterFromAttribute("start_date"); - MetaModel::Init_AddFilterFromAttribute("last_update"); - MetaModel::Init_AddFilterFromAttribute("end_date"); - MetaModel::Init_AddFilterFromAttribute("close_date"); - MetaModel::Init_AddFilterFromAttribute("workgroup_id"); - MetaModel::Init_AddFilterFromAttribute("workgroup_name"); - MetaModel::Init_AddFilterFromAttribute("supervisorgroup_id"); - MetaModel::Init_AddFilterFromAttribute("managergroup_id"); - MetaModel::Init_AddFilterFromAttribute("supervisor_id"); - MetaModel::Init_AddFilterFromAttribute("manager_id"); - MetaModel::Init_AddFilterFromAttribute("agent_id"); - MetaModel::Init_AddFilterFromAttribute("impact"); - MetaModel::Init_AddFilterFromAttribute("assignment_count"); - MetaModel::Init_AddFilterFromAttribute("outage"); - // doit-on aussi ajouter un filtre sur les extfields lié à une extkey ? ici le name de l'agent? // Display lists @@ -229,9 +205,6 @@ class lnkInfraChangeTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title"))); MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("ticket_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list @@ -276,9 +249,6 @@ class lnkContactChange extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("change_number", array("allowed_values"=>null, "extkey_attcode"=> 'change_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("change_id"); - MetaModel::Init_AddFilterFromAttribute("contact_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('change_id', 'contact_id', 'role')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('change_id', 'contact_id', 'role')); // Attributes to be displayed for a list diff --git a/business/KEDB.business.php b/business/KEDB.business.php index 34822ea98..510a208fa 100644 --- a/business/KEDB.business.php +++ b/business/KEDB.business.php @@ -34,24 +34,11 @@ class bizKnownError extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeText("workaround", array("allowed_values"=>null, "sql"=>"workaround", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeText("solution", array("allowed_values"=>null, "sql"=>"solution", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("error_code", array("allowed_values"=>null, "sql"=>"error_code", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("error_code", array("allowed_values"=>null, "sql"=>"error_code", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("domain", array("allowed_values"=>new ValueSetEnum("Network, Server, Application, Desktop"), "sql"=>"domain", "default_value"=>"Application", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("vendor", array("allowed_values"=>null, "sql"=>"vendor", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("model", array("allowed_values"=>null, "sql"=>"model", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("cust_name"); - MetaModel::Init_AddFilterFromAttribute("error_code"); - MetaModel::Init_AddFilterFromAttribute("domain"); - - - - + MetaModel::Init_AddAttribute(new AttributeString("vendor", array("allowed_values"=>null, "sql"=>"vendor", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("model", array("allowed_values"=>null, "sql"=>"model", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_SetZListItems('details', array('name', 'org_id','error_code','domain','vendor','model','version', 'symptom','root_cause','workaround','solution')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'org_id','error_code', 'symptom')); // Attributes to be displayed for a list @@ -98,9 +85,6 @@ class lnkInfraError extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("error_id", array("targetclass"=>"bizKnownError", "jointype"=> '', "allowed_values"=>null, "sql"=>"error_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("error_name", array("allowed_values"=>null, "extkey_attcode"=> 'error_id', "target_attcode"=>"name"))); - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("error_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('infra_id', 'error_id')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('infra_id', 'infra_status','error_id')); // Attributes to be displayed for a list @@ -141,12 +125,6 @@ class lnkDocumentError extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("error_name", array("allowed_values"=>null, "extkey_attcode"=> 'error_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("link_type", array("allowed_values"=>null, "sql"=>"link_type", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("doc_id"); - MetaModel::Init_AddFilterFromAttribute("doc_name"); - MetaModel::Init_AddFilterFromAttribute("error_id"); - MetaModel::Init_AddFilterFromAttribute("error_name"); - MetaModel::Init_AddFilterFromAttribute("link_type"); - // Display lists MetaModel::Init_SetZListItems('details', array('doc_id', 'error_name', 'link_type')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('doc_id', 'error_name', 'link_type')); // Attributes to be displayed for a list diff --git a/business/ServiceDesk.business.php b/business/ServiceDesk.business.php index 405066beb..7e0684394 100644 --- a/business/ServiceDesk.business.php +++ b/business/ServiceDesk.business.php @@ -40,25 +40,25 @@ class bizServiceCall extends cmdbAbstractObject 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 AttributeString("title", array("allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum("Network,Server,Desktop,Application"), "sql"=>"type", "default_value"=>"Server", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum("Network,Server,Desktop,Application"), "sql"=>"type", "default_value"=>"Server", "is_null_allowed"=>false, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeEnum("call_status", array("allowed_values"=>new ValueSetEnum("New, Assigned, WorkInProgress,Resolved,Closed"), "sql"=>"call_status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array()))); // SetPossibleValues("status",array("Open","Monitored","Closed")); MetaModel::Init_AddAttribute(new AttributeText("call_description", array("allowed_values"=>null, "sql"=>"call_description", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeDate("creation_date", array("allowed_values"=>null, "sql"=>"creation_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - // définir une date de défaut à maintenant, alias creation ou modification du ticket + // définir une date de défaut à maintenant, alias creation ou modification du ticket MetaModel::Init_AddAttribute(new AttributeDate("last_update", array("allowed_values"=>null, "sql"=>"last_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeDate("next_update", array("allowed_values"=>null, "sql"=>"next_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - + MetaModel::Init_AddAttribute(new AttributeDate("next_update", array("allowed_values"=>null, "sql"=>"next_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeDate("end_date", array("allowed_values"=>null, "sql"=>"closed_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p WHERE p.org_id = :this->org_id'), "sql"=>"caller_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('org_id')))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p WHERE p.org_id = :this->org_id'), "sql"=>"caller_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('org_id')))); MetaModel::Init_AddAttribute(new AttributeExternalField("caller_mail", array("allowed_values"=>null, "extkey_attcode"=> 'caller_id', "target_attcode"=>"email"))); - - MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + + MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("allowed_values"=>null, "extkey_attcode"=> 'workgroup_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id")))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email"))); // Comment afficher le first + last name de l'agent ? Est-ce utile d'ajouter ce champ? MetaModel::Init_AddAttribute(new AttributeText("action_log", array("allowed_values"=>null, "sql"=>"action_log", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); @@ -69,24 +69,6 @@ class bizServiceCall extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("impacted_infra_manual", array("linked_class"=>"lnkInfraCall", "ext_key_to_me"=>"call_id", "ext_key_to_remote"=>"infra_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("related_tickets", array("linked_class"=>"lnkCallTicket", "ext_key_to_me"=>"call_id", "ext_key_to_remote"=>"ticket_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(/*'impacted_infra_computed',*/ 'impacted_infra_manual')))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("title"); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("caller_id"); - MetaModel::Init_AddFilterFromAttribute("call_status"); - MetaModel::Init_AddFilterFromAttribute("creation_date"); - MetaModel::Init_AddFilterFromAttribute("last_update"); - MetaModel::Init_AddFilterFromAttribute("end_date"); - MetaModel::Init_AddFilterFromAttribute("workgroup_id"); - MetaModel::Init_AddFilterFromAttribute("agent_id"); - MetaModel::Init_AddFilterFromAttribute("severity"); - MetaModel::Init_AddFilterFromAttribute("source"); - - // doit-on aussi ajouter un filtre sur les extfields lié à une extkey ? ici le name de l'agent? - // Display lists MetaModel::Init_SetZListItems('details', array('name','title', 'org_id', 'type','call_status','source', 'severity','creation_date', 'call_description', 'caller_id', 'impact', 'last_update', 'end_date', 'workgroup_id','agent_id','action_log','resolution')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('name', 'title', 'org_id', 'type','call_status','severity','creation_date')); // Attributes to be displayed for a list @@ -195,9 +177,6 @@ class lnkCallTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("call_name", array("allowed_values"=>null, "extkey_attcode"=> 'call_id', "target_attcode"=>"title"))); MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("ticket_id"); - MetaModel::Init_AddFilterFromAttribute("call_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('ticket_id', 'call_id', 'impact')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('ticket_id', 'call_id', 'impact')); // Attributes to be displayed for a list @@ -244,9 +223,6 @@ class lnkInfraCall extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("call_name", array("allowed_values"=>null, "extkey_attcode"=> 'call_id', "target_attcode"=>"title"))); MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("call_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('infra_id', 'call_id', 'impact')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('infra_id', 'call_id', 'impact')); // Attributes to be displayed for a list diff --git a/business/ServiceMgmt.business.php b/business/ServiceMgmt.business.php index eec09e628..3ab609904 100644 --- a/business/ServiceMgmt.business.php +++ b/business/ServiceMgmt.business.php @@ -25,22 +25,15 @@ class bizService 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"=>false, "depends_on"=>array()))); - - MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "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 AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("provider_name", array("allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeEnum("service_category", array("allowed_values"=>new ValueSetEnum("Server,Network,End-User,Desktop,Application"), "sql"=>"service_category", "default_value"=>"End-User", "is_null_allowed"=>false, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeEnum("service_category", array("allowed_values"=>new ValueSetEnum("Server,Network,End-User,Desktop,Application"), "sql"=>"service_category", "default_value"=>"End-User", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum("New, Implementation,Production,Obsolete"), "sql"=>"status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum("Hardware,Software,Support"), "sql"=>"type", "default_value"=>"Support", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("service_category"); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("status"); - /* // Life cycle MetaModel::Init_DefineState("New", array("attribute_inherit"=>null, @@ -103,10 +96,10 @@ class bizContract 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"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "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 AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"bizService", "allowed_values"=>null, "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"bizService", "allowed_values"=>null, "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("provider_name", array("allowed_values"=>null, "extkey_attcode"=> 'service_id', "target_attcode"=>"provider_name"))); MetaModel::Init_AddAttribute(new AttributeExternalField("service_name", array("allowed_values"=>null, "extkey_attcode"=> 'service_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeExternalKey("team_id", array("targetclass"=>"bizTeam", "allowed_values"=>null, "sql"=>"team_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); @@ -123,21 +116,6 @@ class bizContract extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum("Hardware,Software,Support,Licence"), "sql"=>"type", "default_value"=>"Support", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeInteger("version_number", array("allowed_values"=>null, "sql"=>"version_number", "default_value"=>1, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("service_name"); - MetaModel::Init_AddFilterFromAttribute("provider_name"); - MetaModel::Init_AddFilterFromAttribute("service_id"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("team_id"); - MetaModel::Init_AddFilterFromAttribute("team_name"); - MetaModel::Init_AddFilterFromAttribute("service_level"); - MetaModel::Init_AddFilterFromAttribute("end_prod"); - MetaModel::Init_AddFilterFromAttribute("status"); - MetaModel::Init_AddFilterFromAttribute("version_number"); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("type"); - - /* // Life cycle MetaModel::Init_DefineState("New", array("attribute_inherit"=>null, @@ -218,11 +196,7 @@ class lnkInfraContract extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "jointype"=> '', "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("coverage", array("allowed_values"=>null, "sql"=>"coverage", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("service_level", array("allowed_values"=>null, "sql"=>"sla", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("contract_id"); + MetaModel::Init_AddAttribute(new AttributeString("service_level", array("allowed_values"=>null, "sql"=>"sla", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); // Display lists MetaModel::Init_SetZListItems('details', array('infra_id', 'contract_id', 'coverage','service_level')); // Attributes to be displayed for a list @@ -262,9 +236,6 @@ class lnkContactContract extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "jointype"=> '', "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_AddFilterFromAttribute("contract_id"); - MetaModel::Init_AddFilterFromAttribute("contact_id"); // Display lists MetaModel::Init_SetZListItems('details', array('contract_id', 'contact_id', 'role')); // Attributes to be displayed for a list @@ -310,12 +281,6 @@ class lnkDocumentContract extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("link_type", array("allowed_values"=>null, "sql"=>"link_type", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_AddFilterFromAttribute("doc_id"); - MetaModel::Init_AddFilterFromAttribute("doc_name"); - MetaModel::Init_AddFilterFromAttribute("contract_id"); - MetaModel::Init_AddFilterFromAttribute("contract_name"); - MetaModel::Init_AddFilterFromAttribute("link_type"); // Display lists MetaModel::Init_SetZListItems('details', array('doc_id', 'contract_name', 'link_type')); // Attributes to be displayed for the complete details diff --git a/business/ServiceRequest.business.php b/business/ServiceRequest.business.php index 8532a4d05..cd9ae5512 100644 --- a/business/ServiceRequest.business.php +++ b/business/ServiceRequest.business.php @@ -30,31 +30,19 @@ class bizServiceRequest extends cmdbAbstractObject 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 AttributeString("title", array("allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum("Open,approved,rejected,assigned,pending,closed"), "sql"=>"status", "default_value"=>"Open", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("requester_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>null, "sql"=>"requester_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("requester_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>null, "sql"=>"requester_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("requester_mail", array("allowed_values"=>null, "extkey_attcode"=> 'requester_id', "target_attcode"=>"email"))); MetaModel::Init_AddAttribute(new AttributeEnum("priority", array("allowed_values"=>new ValueSetEnum("critical,medium,low"), "sql"=>"priority", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("source", array("allowed_values"=>new ValueSetEnum("phone,E-mail,Fax"), "sql"=>"source", "default_value"=>"phone", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_AddAttribute(new AttributeExternalKey("coordinator_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "allowed_values"=>null, "sql"=>"coordinator_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + + MetaModel::Init_AddAttribute(new AttributeExternalKey("coordinator_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "allowed_values"=>null, "sql"=>"coordinator_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("coordinator_name", array("allowed_values"=>null, "extkey_attcode"=> 'coordinator_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("coordinator_id")))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("coordinator_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("requester_id"); - MetaModel::Init_AddFilterFromAttribute("priority"); - MetaModel::Init_AddFilterFromAttribute("coordinator_id"); - MetaModel::Init_AddFilterFromAttribute("agent_id"); - MetaModel::Init_AddFilterFromAttribute("status"); - MetaModel::Init_AddFilterFromAttribute("source"); - - /* // Life cycle MetaModel::Init_DefineState("New", array("attribute_inherit"=>null, @@ -118,30 +106,19 @@ class bizServiceItem extends cmdbAbstractObject MetaModel::Init_InheritAttributes(); 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 AttributeString("title", array("allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("request_id", array("targetclass"=>"bizServiceRequest", "allowed_values"=>null, "sql"=>"request_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("request_id", array("targetclass"=>"bizServiceRequest", "allowed_values"=>null, "sql"=>"request_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("request_name", array("allowed_values"=>null, "extkey_attcode"=> 'request_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum("Open,approved,rejected,assigned,pending,closed"), "sql"=>"status", "default_value"=>"Open", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("priority", array("allowed_values"=>null, "extkey_attcode"=> 'request_id', "target_attcode"=>"priority"))); MetaModel::Init_AddAttribute(new AttributeText("comment", array("allowed_values"=>null, "sql"=>"comment", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("allowed_values"=>null, "extkey_attcode"=> 'workgroup_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id")))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email"))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("request_id"); - MetaModel::Init_AddFilterFromAttribute("contract_id"); - MetaModel::Init_AddFilterFromAttribute("priority"); - MetaModel::Init_AddFilterFromAttribute("workgroup_id"); - MetaModel::Init_AddFilterFromAttribute("agent_id"); - MetaModel::Init_AddFilterFromAttribute("status"); - MetaModel::Init_AddFilterFromAttribute("priority"); - - /* // Life cycle MetaModel::Init_DefineState("New", array("attribute_inherit"=>null, diff --git a/business/business_itopbegins.class.inc.php b/business/business_itopbegins.class.inc.php index f9bb97d41..c63e5c3db 100644 --- a/business/business_itopbegins.class.inc.php +++ b/business/business_itopbegins.class.inc.php @@ -53,10 +53,6 @@ class cmdbContact extends CMDBObject MetaModel::Init_AddAttribute(new AttributeString("att_contact_name", array("allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"name"))); MetaModel::Init_AddAttribute(new AttributeInteger("att_contact_availability", array("allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"availability"))); MetaModel::Init_AddAttribute(new AttributeDate("start_date", array("allowed_values"=>null, "sql"=>"start_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("att_contact_name"); - MetaModel::Init_AddFilterFromAttribute("att_contact_availability"); } } @@ -92,9 +88,6 @@ class cmdbPerson extends cmdbContact MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeString("att_person_email", array("allowed_values"=>$oValsDunsNumber, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"email"))); MetaModel::Init_AddAttribute(new AttributeString("att_person_name", array("allowed_values"=>new ValueSetEnum(array("nom1", "nom2", "nom10", "no", "noms", "")), "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"name"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("att_person_email"); } } @@ -134,9 +127,6 @@ class cmdbSubcontractor extends cmdbPerson MetaModel::Init_AddAttribute(new AttributeExternalKey("ext_subcontractor_tutor", array("allowed_values"=>null, "sql"=>"tutor", "targetclass"=>"cmdbPerson", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("extatt_subcontractor_tutor_email", array("allowed_values"=>null, "extkey_attcode"=>"ext_subcontractor_tutor", "target_attcode"=>"att_person_email"))); MetaModel::Init_AddAttribute(new AttributeExternalField("extatt_subcontractor_tutor_secondname", array("allowed_values"=>null, "extkey_attcode"=>"ext_subcontractor_tutor", "target_attcode"=>"att_person_name"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("extatt_subcontractor_tutor_secondname"); } } @@ -169,9 +159,6 @@ class cmdbCrowd extends cmdbObject MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeInteger("att_crowd_peoplecount", array("allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"peoplecount"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("att_crowd_peoplecount"); } } @@ -204,9 +191,6 @@ class cmdbCompany extends cmdbCrowd MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeString("att_company_dunsnumber", array("allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"dunsnumber"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("att_company_dunsnumber"); } } @@ -239,9 +223,6 @@ class cmdbProvider extends cmdbCompany MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeInteger("att_provider_ref", array("allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"providerref"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("att_provider_ref"); } } diff --git a/business/business_test.class.inc.php b/business/business_test.class.inc.php index ff38a9d54..e065026f9 100644 --- a/business/business_test.class.inc.php +++ b/business/business_test.class.inc.php @@ -107,11 +107,6 @@ class cmdbContact extends cmdbObjectHomeMade MetaModel::Init_AddAttribute(new AttributeLinkedSet("myworkshops", array("depends_on"=>array(), "linked_class"=>"cmdbLiens", "ext_key_to_me"=>"tocontact", "count_min"=>1, "count_max"=>10, "allowed_values"=>null))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("owner"); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("ownername"); - MetaModel::Init_SetZListItems("list1", array("name", "email")); MetaModel::Init_SetZListItems("list2", array()); MetaModel::Init_SetZListItems("list3", array("ownername")); @@ -184,9 +179,6 @@ class cmdbTeam extends cmdbContact MetaModel::Init_OverloadAttributeParams("email", array()); MetaModel::Init_AddAttribute(new AttributeInteger("headcount", array("allowed_values"=>null, "sql"=>"headcount", "default_value"=>654321, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("headcount"); - MetaModel::Init_SetZListItems("noneditable", array("name")); } @@ -242,9 +234,6 @@ class cmdbOrga extends cmdbObjectHomeMade MetaModel::Init_AddAttribute(new AttributeInteger("_dunsnumber_", array("allowed_values"=>null, "sql"=>"dunsnumber", "default_value"=>99007, "is_null_allowed"=>false, "depends_on"=>array()))); // not yet allowed MetaModel::Init_AddAttribute(new AttributeInteger("_dunsnumberBY2_", array("allowed_values"=>null, "sql"=>"dunsnumber * 3.141592654"))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("_name_"); - MetaModel::Init_SetZListItems("list1", array("_status_")); MetaModel::Init_SetZListItems("list2", array()); MetaModel::Init_SetZListItems("list3", array("_name_")); @@ -290,9 +279,6 @@ class cmdbLiens extends cmdbObjectHomeMade MetaModel::Init_AddAttribute(new AttributeExternalKey("tocontact", array("allowed_values"=>null, "sql"=>"contactid", "targetclass"=>"cmdbContact", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("contact_info", array("allowed_values"=>null, "extkey_attcode"=>"tocontact", "target_attcode"=>"name"))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("function"); - MetaModel::Init_SetZListItems("list1", array("toworkshop", "contact_info")); MetaModel::Init_SetZListItems("list2", array("function")); MetaModel::Init_SetZListItems("list3", array("function")); @@ -335,9 +321,6 @@ class cmdbWorkshop extends cmdbObjectHomeMade //MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeString("namitus", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("namitus"); - MetaModel::Init_SetZListItems("list1", array("namitus")); MetaModel::Init_SetZListItems("list2", array()); MetaModel::Init_SetZListItems("list3", array("namitus")); diff --git a/business/incidentMgmt.business.php b/business/incidentMgmt.business.php index ddaae7a75..60fe0d900 100644 --- a/business/incidentMgmt.business.php +++ b/business/incidentMgmt.business.php @@ -71,22 +71,6 @@ class bizIncidentTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("related_tickets", array("linked_class"=>"lnkRelatedTicket", "ext_key_to_me"=>"ticket_id", "ext_key_to_remote"=>"rel_ticket_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(/*'impacted_infra_computed',*/ 'impacted_infra_manual')))); MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("contacts_a_notifier", array("linked_class"=>"lnkContactTicket", "ext_key_to_me"=>"ticket_id", "ext_key_to_remote"=>"contact_id", "allowed_values"=>null, "default_value"=>new ValueSetRelatedObjectsFromLinkSet('impacted_infra_manual'/*sLinkSetAttCode*/, 'infra_id'/*sExtKeyToRemote*/, 'impacts'/*sRelationCode*/, 3/*iMaxDepth*/, 'bizContact'/*sTargetClass*/, 'lnkContactTicket'/*sTargetLinkClass*/, 'contact_id'/*sTargetExtKey*/) /* ici plus tard... */, "count_min"=>0, "count_max"=>0, "depends_on"=>array('impacted_infra_manual')))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("title"); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("caller_id"); - MetaModel::Init_AddFilterFromAttribute("ticket_status"); - MetaModel::Init_AddFilterFromAttribute("start_date"); - MetaModel::Init_AddFilterFromAttribute("last_update"); - MetaModel::Init_AddFilterFromAttribute("end_date"); - MetaModel::Init_AddFilterFromAttribute("workgroup_id"); - MetaModel::Init_AddFilterFromAttribute("agent_id"); - MetaModel::Init_AddFilterFromAttribute("severity"); - MetaModel::Init_AddFilterFromAttribute("assignment_count"); - // doit-on aussi ajouter un filtre sur les extfields lié à une extkey ? ici le name de l'agent? // Display lists @@ -237,9 +221,6 @@ class lnkRelatedTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title"))); MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("rel_ticket_id"); - MetaModel::Init_AddFilterFromAttribute("ticket_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('rel_ticket_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('rel_ticket_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list @@ -286,9 +267,6 @@ class lnkInfraTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title"))); MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("ticket_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list @@ -335,9 +313,6 @@ class lnkContactTicket extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("contact_id"); - MetaModel::Init_AddFilterFromAttribute("ticket_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('contact_id', 'ticket_id', 'role')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('contact_id', 'ticket_id', 'role')); // Attributes to be displayed for a list @@ -384,12 +359,6 @@ class bizWorkgroup extends logRealObject MetaModel::Init_AddAttribute(new AttributeExternalField("team_name", array("allowed_values"=>null, "extkey_attcode"=> 'team_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>new ValueSetEnum("1st level support,2nd level support,3rd level support"), "sql"=>"role", "default_value"=>"1st level support", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("org_name"); - MetaModel::Init_AddFilterFromAttribute("team_id"); - MetaModel::Init_AddFilterFromAttribute("role"); - - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'team_id', 'role')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'team_id','role')); // Attributes to be displayed for a list diff --git a/business/itop.business.class.inc.php b/business/itop.business.class.inc.php index 2c4ac2289..dffa02cb5 100644 --- a/business/itop.business.class.inc.php +++ b/business/itop.business.class.inc.php @@ -74,11 +74,6 @@ class bizOrganization extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("parent_name", array("allowed_values"=>null, "extkey_attcode"=> 'parent_id', "target_attcode"=>"name"))); - MetaModel::Init_AddFilterFromAttribute("parent_id"); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("code"); - MetaModel::Init_AddFilterFromAttribute("status"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'code', 'status', 'parent_id')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'status', 'parent_id')); // Attributes to be displayed for a list @@ -144,11 +139,6 @@ class logRealObject extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("org_name", array("allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name"))); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("status"); - MetaModel::Init_AddFilterFromAttribute("org_id"); - MetaModel::Init_AddFilterFromAttribute("org_name"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'status', 'org_id')); // Attributes to be displayed for a list @@ -199,13 +189,6 @@ class bizContact extends logRealObject MetaModel::Init_AddAttribute(new AttributeExternalKey("location_id", array("targetclass"=>"bizLocation", "allowed_values"=>new ValueSetObjects('SELECT bizLocation AS p WHERE p.org_id = :this->org_id'), "sql"=>"location_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("location_name", array("allowed_values"=>null, "extkey_attcode"=> 'location_id', "target_attcode"=>"name"))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("org_name"); - MetaModel::Init_AddFilterFromAttribute("email"); - MetaModel::Init_AddFilterFromAttribute("phone"); - MetaModel::Init_AddFilterFromAttribute("location_id"); - MetaModel::Init_AddFilterFromAttribute("location_name"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'email', 'location_id', 'phone')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'status', 'org_id', 'email', 'location_id', 'phone')); // Attributes to be displayed for a list @@ -252,10 +235,6 @@ class bizPerson extends bizContact MetaModel::Init_AddAttribute(new AttributeString("first_name", array("allowed_values"=>null, "sql"=>"first_name", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("employee_number", array("allowed_values"=>null, "sql"=>"employee_number", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("first_name"); - MetaModel::Init_AddFilterFromAttribute("employee_number"); - // Display lists MetaModel::Init_SetZListItems('details', array('first_name', 'name', 'status', 'org_id', 'email', 'location_id', 'phone', 'employee_number')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('first_name', 'name', 'status', 'org_id', 'email', 'location_id', 'phone')); // Attributes to be displayed for a list @@ -300,8 +279,6 @@ class bizTeam extends bizContact MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'email', 'location_id', 'phone')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'status', 'org_id', 'email', 'location_id', 'phone')); // Attributes to be displayed for a list @@ -341,12 +318,6 @@ class lnkContactTeam extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("team_name", array("allowed_values"=>null, "extkey_attcode"=> 'team_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("contact_id"); - MetaModel::Init_AddFilterFromAttribute("contact_name"); - MetaModel::Init_AddFilterFromAttribute("team_id"); - MetaModel::Init_AddFilterFromAttribute("team_name"); - MetaModel::Init_AddFilterFromAttribute("role"); - // Display lists MetaModel::Init_SetZListItems('details', array('contact_id', 'contact_phone', 'contact_email', 'team_id', 'role')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('contact_id', 'contact_phone', 'contact_email', 'team_id', 'role')); // Attributes to be displayed for a list @@ -386,10 +357,6 @@ class bizDocument extends logRealObject MetaModel::Init_AddAttribute(new AttributeBlob("contents", array("depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("description"); - MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'type', 'description', 'contents')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'status', 'org_id', 'type', 'contents')); // Attributes to be displayed for a list // Search criteria @@ -429,12 +396,6 @@ class lnkDocumentRealObject extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("object_name", array("allowed_values"=>null, "extkey_attcode"=> 'object_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("link_type", array("allowed_values"=>null, "sql"=>"link_type", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("doc_id"); - MetaModel::Init_AddFilterFromAttribute("doc_name"); - MetaModel::Init_AddFilterFromAttribute("object_id"); - MetaModel::Init_AddFilterFromAttribute("object_name"); - MetaModel::Init_AddFilterFromAttribute("link_type"); - // Display lists MetaModel::Init_SetZListItems('details', array('doc_id', 'object_id', 'link_type')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('doc_id', 'object_id', 'link_type')); // Attributes to be displayed for a list @@ -475,12 +436,6 @@ class lnkContactRealObject extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("object_name", array("allowed_values"=>null, "extkey_attcode"=> 'object_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("contact_id"); - MetaModel::Init_AddFilterFromAttribute("contact_name"); - MetaModel::Init_AddFilterFromAttribute("object_id"); - MetaModel::Init_AddFilterFromAttribute("object_name"); - MetaModel::Init_AddFilterFromAttribute("role"); - // Display lists MetaModel::Init_SetZListItems('details', array('contact_id', 'contact_phone', 'contact_email', 'object_id', 'role')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('contact_id', 'contact_phone', 'contact_email', 'object_id', 'role')); // Attributes to be displayed for a list @@ -516,10 +471,7 @@ abstract class logInfra extends logRealObject MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('production,implementation,obsolete'), "sql"=>"status", "default_value"=>"implementation", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeEnum("severity", array("allowed_values"=>new ValueSetEnum("high,medium,low"), "sql"=>"severity", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("severity"); + MetaModel::Init_AddAttribute(new AttributeEnum("severity", array("allowed_values"=>new ValueSetEnum("high,medium,low"), "sql"=>"severity", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array()))); } } @@ -553,12 +505,6 @@ class lnkContactInfra extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_id", array("targetclass"=>"logInfra", "allowed_values"=>null, "sql"=>"infra_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("infra_name", array("allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("role", array("allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_AddFilterFromAttribute("contact_id"); - MetaModel::Init_AddFilterFromAttribute("contact_name"); - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("infra_name"); - MetaModel::Init_AddFilterFromAttribute("role"); // Display lists MetaModel::Init_SetZListItems('details', array('contact_id', 'contact_phone', 'contact_email', 'infra_id', 'role')); // Attributes to be displayed for the complete details @@ -597,14 +543,6 @@ class bizLocation extends logInfra MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_location_id", array("targetclass"=>"bizLocation", "allowed_values"=>null, "sql"=>"parent_location_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("parent_location_name", array("allowed_values"=>null, "extkey_attcode"=> 'parent_location_id', "target_attcode"=>"name"))); - // on veut pouvoir rechercher une location qui soit un descendant (pas obligatoirement direct) d'une Location, on fait comment ? - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("country"); - MetaModel::Init_AddFilterFromAttribute("address"); - MetaModel::Init_AddFilterFromAttribute("parent_location_id"); - MetaModel::Init_AddFilterFromAttribute("parent_location_name"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'address', 'country', 'parent_location_id')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'status', 'org_id', 'country')); // Attributes to be displayed for a list @@ -740,16 +678,6 @@ class bizCircuit extends logInfra MetaModel::Init_AddAttribute(new AttributeExternalKey("provider_id", array("targetclass"=>"bizOrganization", "allowed_values"=>null, "sql"=>"provider_id", "is_null_allowed"=>false,"on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("carrier_name", array("allowed_values"=>null, "extkey_attcode"=> 'provider_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("carrier_ref", array("allowed_values"=>null, "sql"=>"carrier_ref", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("speed"); - MetaModel::Init_AddFilterFromAttribute("location1_id"); - MetaModel::Init_AddFilterFromAttribute("location2_id"); - MetaModel::Init_AddFilterFromAttribute("interface1_id"); - MetaModel::Init_AddFilterFromAttribute("interface2_id"); - - MetaModel::Init_AddFilterFromAttribute("provider_id"); - MetaModel::Init_AddFilterFromAttribute("carrier_ref"); // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'speed', 'location1_id','interface1_id','device1_name','location2_id','interface2_id','device2_name','provider_id', 'carrier_ref')); // Attributes to be displayed for the complete details @@ -810,24 +738,14 @@ class bizInterface extends logInfra MetaModel::Init_AddAttribute(new AttributeEnum("logical_type", array("allowed_values"=>new ValueSetEnum("primary,secondary,backup,port,logical"), "sql"=>"logical_type", "default_value"=>"port", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("physical_type", array("allowed_values"=>new ValueSetEnum("ethernet,framerelay,atm,vlan"), "sql"=>"physical_type", "default_value"=>"ethernet", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("ip_address", array("allowed_values"=>null, "sql"=>"ip_address", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("mask", array("allowed_values"=>null, "sql"=>"mask", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("mac", array("allowed_values"=>null, "sql"=>"mac", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("speed", array("allowed_values"=>null, "sql"=>"speed", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeEnum("duplex", array("allowed_values"=>new ValueSetEnum("half,full,unknown"), "sql"=>"duplex", "default_value"=>"unknown", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("ip_address", array("allowed_values"=>null, "sql"=>"ip_address", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("mask", array("allowed_values"=>null, "sql"=>"mask", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("mac", array("allowed_values"=>null, "sql"=>"mac", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("speed", array("allowed_values"=>null, "sql"=>"speed", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeEnum("duplex", array("allowed_values"=>new ValueSetEnum("half,full,unknown"), "sql"=>"duplex", "default_value"=>"unknown", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("if_connected_id", array("targetclass"=>"bizInterface", "allowed_values"=>null, "sql"=>"ext_if_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("if_connected_name", array("allowed_values"=>null, "extkey_attcode"=> 'if_connected_id', "target_attcode"=>"name"))); - MetaModel::Init_AddAttribute(new AttributeExternalField("if_connected_device", array("allowed_values"=>null, "extkey_attcode"=> 'if_connected_id', "target_attcode"=>"device_name"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("device_id"); - MetaModel::Init_AddFilterFromAttribute("device_name"); - MetaModel::Init_AddFilterFromAttribute("device_location_id"); - MetaModel::Init_AddFilterFromAttribute("logical_type"); - MetaModel::Init_AddFilterFromAttribute("physical_type"); - MetaModel::Init_AddFilterFromAttribute("ip_address"); - MetaModel::Init_AddFilterFromAttribute("mac"); - MetaModel::Init_AddFilterFromAttribute("if_connected_id"); + MetaModel::Init_AddAttribute(new AttributeExternalField("if_connected_device", array("allowed_values"=>null, "extkey_attcode"=> 'if_connected_id', "target_attcode"=>"device_name"))); // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'device_id', 'device_location_id','severity','logical_type','physical_type','ip_address','mask','mac','speed','duplex','if_connected_name','if_connected_device')); // Attributes to be displayed for the complete details @@ -900,10 +818,6 @@ class bizSubnet extends logInfra MetaModel::Init_AddAttribute(new AttributeString("ip", array("allowed_values"=>null, "sql"=>"ip", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("mask", array("allowed_values"=>null, "sql"=>"mask", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("ip"); - MetaModel::Init_AddFilterFromAttribute("mask"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'ip','mask')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'ip', 'mask')); // Attributes to be displayed for a list @@ -985,14 +899,6 @@ class bizDevice extends logInfra MetaModel::Init_AddAttribute(new AttributeString("model", array("allowed_values"=>null, "sql"=>"model", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("serial_number", array("allowed_values"=>null, "sql"=>"serial_number", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("mgmt_ip", array("allowed_values"=>null, "sql"=>"mgmt_ip", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("location_id"); - MetaModel::Init_AddFilterFromAttribute("country"); - MetaModel::Init_AddFilterFromAttribute("brand"); - MetaModel::Init_AddFilterFromAttribute("model"); - MetaModel::Init_AddFilterFromAttribute("serial_number"); - MetaModel::Init_AddFilterFromAttribute("mgmt_ip"); } public static function GetRelationQueries($sRelCode) @@ -1055,14 +961,6 @@ class bizPC extends bizDevice MetaModel::Init_AddAttribute(new AttributeString("os_version", array("allowed_values"=>null, "sql"=>"os_version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("shipment_number", array("allowed_values"=>null, "sql"=>"shipment_number", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("default_gateway", array("allowed_values"=>null, "sql"=>"default_gateway", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("memory_size"); - MetaModel::Init_AddFilterFromAttribute("cpu"); - MetaModel::Init_AddFilterFromAttribute("hdd_size"); - MetaModel::Init_AddFilterFromAttribute("os_family"); - MetaModel::Init_AddFilterFromAttribute("os_version"); // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status','severity', 'org_id', 'location_id', 'brand', 'model','os_family','os_version','mgmt_ip','default_gateway','shipment_number','serial_number', 'type', 'cpu', 'memory_size', 'hdd_size')); // Attributes to be displayed for the complete details @@ -1150,17 +1048,6 @@ class bizServer extends bizDevice MetaModel::Init_AddAttribute(new AttributeString("os_version", array("allowed_values"=>null, "sql"=>"os_version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("shipment_number", array("allowed_values"=>null, "sql"=>"shipment_number", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("default_gateway", array("allowed_values"=>null, "sql"=>"default_gateway", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("status"); - MetaModel::Init_AddFilterFromAttribute("memory_size"); - MetaModel::Init_AddFilterFromAttribute("cpu"); - MetaModel::Init_AddFilterFromAttribute("number_of_cpus"); - MetaModel::Init_AddFilterFromAttribute("hdd_size"); - MetaModel::Init_AddFilterFromAttribute("hdd_free_size"); - MetaModel::Init_AddFilterFromAttribute("os_family"); - MetaModel::Init_AddFilterFromAttribute("os_version"); - /* // Life cycle @@ -1317,10 +1204,6 @@ class bizNetworkDevice extends bizDevice MetaModel::Init_AddAttribute(new AttributeString("snmp_read", array("allowed_values"=>null, "sql"=>"snmp_read", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("snmp_write", array("allowed_values"=>null, "sql"=>"snmp_write", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("ios_version"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status','severity','org_id', 'location_id', 'brand','model','type','mgmt_ip','default_gateway','serial_number','ios_version','memory','snmp_read','snmp_write')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'status','org_id','brand','model','type','mgmt_ip')); // Attributes to be displayed for a list @@ -1376,13 +1259,6 @@ class bizInfraGroup extends logInfra MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_group_id", array("targetclass"=>"bizInfraGroup", "allowed_values"=>null, "sql"=>"parent_group_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("parent_group_name", array("allowed_values"=>null, "extkey_attcode"=> 'parent_group_id', "target_attcode"=>"name"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("type"); - MetaModel::Init_AddFilterFromAttribute("parent_group_id"); - MetaModel::Init_AddFilterFromAttribute("parent_group_name"); - - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'type', 'description','parent_group_id')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('name', 'status', 'org_id', 'type', 'description')); // Attributes to be displayed for a list @@ -1459,16 +1335,6 @@ class bizApplication extends logInfra MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>"undefined", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("function", array("allowed_values"=>null, "sql"=>"function", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("function"); - MetaModel::Init_AddFilterFromAttribute("version"); - MetaModel::Init_AddFilterFromAttribute("device_id"); - MetaModel::Init_AddFilterFromAttribute("device_name"); - - - - // Display lists MetaModel::Init_SetZListItems('details', array('name','device_id','org_id','status','install_date', 'version','function')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name','device_id', 'version', 'function')); // Attributes to be displayed for a list @@ -1537,11 +1403,7 @@ class lnkInfraGrouping extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_group_id", array("targetclass"=>"bizInfraGroup", "jointype"=> '', "allowed_values"=>null, "sql"=>"infra_group_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("group_name", array("allowed_values"=>null, "extkey_attcode"=> 'infra_group_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>"none", "is_null_allowed"=>true, "depends_on"=>array()))); - // impact should modelized: enum (eg: if the group si dead when infra is dead) - - MetaModel::Init_AddFilterFromAttribute("infra_id"); - MetaModel::Init_AddFilterFromAttribute("infra_group_id"); - MetaModel::Init_AddFilterFromAttribute("impact"); + // impact should modelized: enum (eg: if the group si dead when infra is dead) // Display lists MetaModel::Init_SetZListItems('details', array('infra_id','infra_status', 'impact', 'infra_group_id')); // Attributes to be displayed for a list @@ -1594,9 +1456,6 @@ class lnkClientServer extends logRealObject MetaModel::Init_AddAttribute(new AttributeExternalKey("server_id", array("targetclass"=>"bizApplication", "jointype"=> '', "allowed_values"=>null, "sql"=>"server_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("server_name", array("allowed_values"=>null, "extkey_attcode"=> 'server_id', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeString("relation", array("allowed_values"=>null, "sql"=>"relation", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_AddFilterFromAttribute("client_id"); - MetaModel::Init_AddFilterFromAttribute("server_id"); // Display lists MetaModel::Init_SetZListItems('details', array('client_id', 'server_id', 'relation')); // Attributes to be displayed for a list @@ -1641,14 +1500,6 @@ class bizPatch extends logRealObject MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("patch_type", array("allowed_values"=>new ValueSetEnum("OS,Application"), "sql"=>"patch_type", "default_value"=>"OS", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - - MetaModel::Init_AddFilterFromAttribute("patch_type"); - MetaModel::Init_AddFilterFromAttribute("device_id"); - - - - // Display lists MetaModel::Init_SetZListItems('details', array('name','device_id', 'install_date', 'patch_type','description')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name','device_id', 'patch_type','install_date')); // Attributes to be displayed for a list diff --git a/business/test_farm.class.inc.php b/business/test_farm.class.inc.php index 15c230927..dcc524fa6 100644 --- a/business/test_farm.class.inc.php +++ b/business/test_farm.class.inc.php @@ -49,13 +49,6 @@ class Animal extends cmdbObject MetaModel::Init_AddAttribute(new AttributeInteger("speed", array("allowed_values"=>null, "sql"=>"speed", "default_value"=>4, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("mother", array("allowed_values"=>null, "sql"=>"mother", "targetclass"=>"Animal", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("father", array("allowed_values"=>null, "sql"=>"father", "targetclass"=>"Animal", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("sex"); - MetaModel::Init_AddFilterFromAttribute("species"); - MetaModel::Init_AddFilterFromAttribute("speed"); - MetaModel::Init_AddFilterFromAttribute("mother"); - MetaModel::Init_AddFilterFromAttribute("father"); } } @@ -82,14 +75,6 @@ class Mammal extends Animal MetaModel::Init_AddAttribute(new AttributeInteger("height", array("allowed_values"=>null, "sql"=>"height", "default_value"=>1, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeDate("birth", array("allowed_values"=>null, "sql"=>"birth", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("member", array("allowed_values"=>null, "sql"=>"member", "targetclass"=>"Group", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); - -// ? MetaModel::Init_AddAttribute(new AttributeLinkedSet("a2a", array("depends_on"=>array(), "linked_class"=>"Animal2animal", "ext_key_to_me"=>"animal1", "count_min"=>0, "count_max"=>10, "allowed_values"=>null))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("height"); - MetaModel::Init_AddFilterFromAttribute("birth"); - MetaModel::Init_AddFilterFromAttribute("member"); } } @@ -112,8 +97,6 @@ class Bird extends Animal MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_OverloadAttributeParams("species", array("allowed_values"=>array('geese', 'rooster', 'chicken', 'turckey', 'pie', 'corbeau'))); - - MetaModel::Init_InheritFilters(); } } @@ -136,7 +119,6 @@ class WalkingBird extends Bird MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_OverloadAttributeParams("species", array("allowed_values"=>array('geese', 'rooster', 'chicken', 'turckey'))); - MetaModel::Init_InheritFilters(); } } @@ -160,9 +142,6 @@ class FlyingBird extends Bird MetaModel::Init_InheritAttributes(); MetaModel::Init_OverloadAttributeParams("species", array("allowed_values"=>array('pie', 'corbeau'))); MetaModel::Init_AddAttribute(new AttributeInteger("flyingspeed", array("allowed_values"=>null, "sql"=>"headcount", "default_value"=>10, "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("flyingspeed"); } } @@ -188,10 +167,6 @@ class AnimalRelation extends cmdbObject // What makes it being a link... MetaModel::Init_AddAttribute(new AttributeExternalKey("animal1", array("allowed_values"=>null, "sql"=>"a1", "targetclass"=>"Animal", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("animal2", array("allowed_values"=>null, "sql"=>"a2", "targetclass"=>"Animal", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("animal1"); - MetaModel::Init_AddFilterFromAttribute("animal2"); } } @@ -215,9 +190,6 @@ class EaterToEaten extends AnimalRelation MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeEnum("DeadOrAlive", array("allowed_values"=>new ValueSetEnum('dead, fresh, cooked'), "sql"=>"deadoralive", "default_value"=>"fresh", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("DeadOrAlive"); } } @@ -243,12 +215,6 @@ class Group extends cmdbObject MetaModel::Init_AddAttribute(new AttributeExternalKey("leader", array("allowed_values"=>null, "sql"=>"leader", "targetclass"=>"Mammal", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("leader_name", array("allowed_values"=>null, "extkey_attcode"=> 'leader', "target_attcode"=>"name"))); MetaModel::Init_AddAttribute(new AttributeExternalField("leader_speed", array("allowed_values"=>null, "extkey_attcode"=> 'leader', "target_attcode"=>"speed"))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("leader"); - MetaModel::Init_AddFilterFromAttribute("leader_name"); - MetaModel::Init_AddFilterFromAttribute("leader_speed"); } } diff --git a/core/action.class.inc.php b/core/action.class.inc.php index 603a107f9..399c10405 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -37,10 +37,6 @@ abstract class Action extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum(array('test'=>'Being tested' ,'enabled'=>'In production', 'disabled'=>'Inactive')), "sql"=>"status", "default_value"=>"test", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("related_triggers", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("name"); - MetaModel::Init_AddFilterFromAttribute("description"); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'status')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list @@ -108,8 +104,6 @@ abstract class ActionNotification extends Action MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'status')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list @@ -161,8 +155,6 @@ class ActionEmail extends ActionNotification MetaModel::Init_AddAttribute(new AttributeTemplateText("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php index 118e4ab29..0ba2f3a76 100644 --- a/core/attributedef.class.inc.php +++ b/core/attributedef.class.inc.php @@ -210,6 +210,11 @@ abstract class AttributeDefinition //abstract protected GetBasicFilterHTMLInput(); abstract public function GetBasicFilterSQLExpr($sOpCode, $value); + public function GetFilterDefinitions() + { + return array(); + } + public function GetEditValue($sValue) { return (string)$sValue; @@ -386,6 +391,11 @@ class AttributeDBFieldVoid extends AttributeDefinition return $aColumns; } + public function GetFilterDefinitions() + { + return array($this->GetCode() => new FilterFromAttribute($this)); + } + public function GetBasicFilterOperators() { return array("="=>"equals", "!="=>"differs from"); @@ -729,6 +739,12 @@ class AttributePassword extends AttributeString public function GetEditClass() {return "Password";} protected function GetSQLCol() {return "VARCHAR(64)";} + + public function GetFilterDefinitions() + { + // not allowed to search on passwords! + return array(); + } } /** @@ -1266,6 +1282,11 @@ class AttributeExternalField extends AttributeDefinition return $oExtAttDef->IsScalar(); } + public function GetFilterDefinitions() + { + return array($this->GetCode() => new FilterFromAttribute($this)); + } + public function GetBasicFilterOperators() { $oExtAttDef = $this->GetExtAttDef(); @@ -1360,7 +1381,7 @@ class AttributeURL extends AttributeString } /** - * Data column, consisting in TWO columns in the DB + * A blob is an ormDocument, it is stored as several columns in the database * * @package iTopORM * @author Romain Quetiez @@ -1467,6 +1488,17 @@ class AttributeBlob extends AttributeDefinition return $aColumns; } + public function GetFilterDefinitions() + { + return array(); + // still not working... see later... + return array( + $this->GetCode().'->filename' => new FilterFromAttribute($this, '_filename'), + $this->GetCode().'_mimetype' => new FilterFromAttribute($this, '_mimetype'), + $this->GetCode().'_mimetype' => new FilterFromAttribute($this, '_mimetype') + ); + } + public function GetBasicFilterOperators() { return array(); diff --git a/core/cmdbchange.class.inc.php b/core/cmdbchange.class.inc.php index 9e1fd2113..54cdfc94c 100644 --- a/core/cmdbchange.class.inc.php +++ b/core/cmdbchange.class.inc.php @@ -31,10 +31,6 @@ class CMDBChange extends DBObject //MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeDate("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("date"); - MetaModel::Init_AddFilterFromAttribute("userinfo"); } } diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php index 324d41868..f347c2f17 100644 --- a/core/cmdbchangeop.class.inc.php +++ b/core/cmdbchangeop.class.inc.php @@ -36,11 +36,6 @@ class CMDBChangeOp extends DBObject MetaModel::Init_AddAttribute(new AttributeString("objclass", array("allowed_values"=>null, "sql"=>"objclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("objkey", array("allowed_values"=>null, "sql"=>"objkey", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("objclass"); - MetaModel::Init_AddFilterFromAttribute("objkey"); - MetaModel::Init_AddFilterFromAttribute("date"); - MetaModel::Init_AddFilterFromAttribute("userinfo"); - MetaModel::Init_SetZListItems('details', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details } @@ -83,8 +78,6 @@ class CMDBChangeOpCreate extends CMDBChangeOp ); MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - - MetaModel::Init_InheritFilters(); } /** @@ -125,8 +118,6 @@ class CMDBChangeOpDelete extends CMDBChangeOp ); MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - - MetaModel::Init_InheritFilters(); } /** * Describe (as a text string) the modifications corresponding to this change @@ -167,9 +158,6 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("attcode"); // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details @@ -207,10 +195,6 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeString("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("oldvalue"); - MetaModel::Init_AddFilterFromAttribute("newvalue"); // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details @@ -307,8 +291,6 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeBlob("prevdata", array("depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list @@ -375,8 +357,6 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list diff --git a/core/event.class.inc.php b/core/event.class.inc.php index 10ff395e6..6065ab8d0 100644 --- a/core/event.class.inc.php +++ b/core/event.class.inc.php @@ -34,10 +34,6 @@ class Event extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeDate("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("message"); - MetaModel::Init_AddFilterFromAttribute("date"); - // Display lists MetaModel::Init_SetZListItems('details', array('message', 'date', 'userinfo')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('date', 'finalclass', 'message')); // Attributes to be displayed for a list @@ -70,11 +66,6 @@ class EventNotification extends Event MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> "", "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("trigger_id"); - MetaModel::Init_AddFilterFromAttribute("action_id"); - MetaModel::Init_AddFilterFromAttribute("object_id"); - // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('date', 'userinfo')); // Attributes to be displayed for a list @@ -110,7 +101,6 @@ class EventNotificationEmail extends EventNotification MetaModel::Init_AddAttribute(new AttributeText("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeText("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body')); // Attributes to be displayed for the complete details @@ -150,10 +140,6 @@ class EventIssue extends Event MetaModel::Init_AddAttribute(new AttributeTable("callstack", array("allowed_values"=>null, "sql"=>"callstack", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributePropertySet("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("issue"); - MetaModel::Init_AddFilterFromAttribute("impact"); - // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'issue', 'impact', 'page', 'arguments_post', 'arguments_get', 'callstack', 'data')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'issue', 'impact')); // Attributes to be displayed for a list @@ -228,8 +214,6 @@ class EventWebService extends Event MetaModel::Init_AddAttribute(new AttributeText("log_error", array("allowed_values"=>null, "sql"=>"log_error", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeText("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'verb', 'result', 'log_info', 'log_warning', 'log_error', 'data')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'verb', 'result')); // Attributes to be displayed for a list diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 54fd02e8b..35b06a9cf 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -847,11 +847,28 @@ abstract class MetaModel } foreach (self::GetClasses() as $sClass) { - // Compute the fields that will be used to display a pointer to another object - // self::$m_aExtKeyFriends[$sClass] = array(); foreach (self::$m_aAttribDefs[$sClass] as $sAttCode => $oAttDef) { + // Compute the filter codes + // + foreach ($oAttDef->GetFilterDefinitions() as $sFilterCode => $oFilterDef) + { + self::$m_aFilterDefs[$sClass][$sFilterCode] = $oFilterDef; + } + + if ($oAttDef->IsExternalField()) + { + $sKeyAttCode = $oAttDef->GetKeyAttCode(); + $oKeyDef = self::GetAttributeDef($sClass, $sKeyAttCode); + self::$m_aFilterOrigins[$sClass][$sFilterCode] = $oKeyDef->GetTargetClass(); + } + else + { + self::$m_aFilterOrigins[$sClass][$sFilterCode] = self::$m_aAttribOrigins[$sClass][$sAttCode]; + } + // Compute the fields that will be used to display a pointer to another object + // if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) { // oAttDef is either @@ -1088,86 +1105,6 @@ abstract class MetaModel $oAtt->SetHostClass($sTargetClass); } - public static function Init_InheritFilters($sSourceClass = null) - { - $sTargetClass = self::GetCallersPHPClass("Init"); - if (empty($sSourceClass)) - { - // Default: inherit from parent class - $sSourceClass = self::GetParentPersistentClass($sTargetClass); - if (empty($sSourceClass)) return; // no filters for the mother of all classes - } - if (isset(self::$m_aFilterDefs[$sSourceClass])) - { - if (!isset(self::$m_aFilterDefs[$sTargetClass])) - { - self::$m_aFilterDefs[$sTargetClass] = array(); - self::$m_aFilterOrigins[$sTargetClass] = array(); - } - - foreach (self::$m_aFilterDefs[$sSourceClass] as $sFltCode=>$oFilter) - { - if ($oFilter instanceof FilterFromAttribute) - { - // In that case, cloning is not enough: - // we must ensure that we will point to the correct - // attribute definition (in case some properties are overloaded) - $oAttDef1 = $oFilter->__GetRefAttribute(); - $oAttDef2 = self::GetAttributeDef($sTargetClass, $oAttDef1->GetCode()); - $oNewFilter = new FilterFromAttribute($oAttDef2); - } - else - { - $oNewFilter = clone $oFilter; - } - self::$m_aFilterDefs[$sTargetClass][$sFltCode] = $oNewFilter; - } - - self::$m_aFilterOrigins[$sTargetClass] = array_merge(self::$m_aFilterOrigins[$sTargetClass], self::$m_aFilterOrigins[$sSourceClass]); - } - } - - public static function Init_OverloadFilterParams($sFltCode, $aParams) - { - $sTargetClass = self::GetCallersPHPClass("Init"); - - if (!self::IsValidFilterCode($sTargetClass, $sFltCode)) - { - throw new CoreException("Could not overload '$sFltCode', expecting a code from {".implode(", ", self::GetFiltersList($sTargetClass))."}"); - } - self::$m_aFilterDefs[$sTargetClass][$sFltCode]->OverloadParams($aParams); - } - - public static function Init_AddFilter(FilterDefinition $oFilter) - { - $sTargetClass = self::GetCallersPHPClass("Init"); - self::$m_aFilterDefs[$sTargetClass][$oFilter->GetCode()] = $oFilter; - self::$m_aFilterOrigins[$sTargetClass][$oFilter->GetCode()] = $sTargetClass; - // Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used - } - public static function Init_AddFilterFromAttribute($sAttCode) - { - $sTargetClass = self::GetCallersPHPClass("Init"); - - $oAttDef = self::GetAttributeDef($sTargetClass, $sAttCode); - - $sFilterCode = $sAttCode; - $oNewFilter = new FilterFromAttribute($oAttDef); - self::$m_aFilterDefs[$sTargetClass][$sFilterCode] = $oNewFilter; - - if ($oAttDef->IsExternalField()) - { - $sKeyAttCode = $oAttDef->GetKeyAttCode(); - $oKeyDef = self::GetAttributeDef($sTargetClass, $sKeyAttCode); - self::$m_aFilterOrigins[$sTargetClass][$sFilterCode] = $oKeyDef->GetTargetClass(); - } - else - { - self::$m_aFilterOrigins[$sTargetClass][$sFilterCode] = $sTargetClass; - } - // Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used - } - public static function Init_SetZListItems($sListCode, $aItems) { MyHelpers::CheckKeyInArray('list code', $sListCode, self::$m_aListInfos); diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php index a1399721c..608ccafdc 100644 --- a/core/trigger.class.inc.php +++ b/core/trigger.class.inc.php @@ -35,9 +35,6 @@ class Trigger extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("linked_actions", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"trigger_id", "ext_key_to_remote"=>"action_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array()))); - //MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("description"); - // Display lists MetaModel::Init_SetZListItems('details', array('finalclass', 'description')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'description')); // Attributes to be displayed for a list @@ -83,9 +80,6 @@ class TriggerOnObject extends Trigger MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>null, "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("target_class"); - // Display lists MetaModel::Init_SetZListItems('details', array('description', 'target_class')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list @@ -116,9 +110,6 @@ class TriggerOnStateChange extends TriggerOnObject MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeString("state", array("allowed_values"=>null, "sql"=>"state", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_InheritFilters(); - MetaModel::Init_AddFilterFromAttribute("state"); - // Display lists MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state', 'description')); // Attributes to be displayed for a list @@ -148,8 +139,6 @@ class TriggerOnStateEnter extends TriggerOnStateChange MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('target_class', 'state', 'description')); // Attributes to be displayed for a list @@ -179,8 +168,6 @@ class TriggerOnStateLeave extends TriggerOnStateChange MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('target_class', 'state', 'description')); // Attributes to be displayed for a list @@ -210,8 +197,6 @@ class TriggerOnObjectCreate extends TriggerOnObject MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_InheritFilters(); - // Display lists MetaModel::Init_SetZListItems('details', array('description', 'target_class')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list @@ -245,10 +230,6 @@ class lnkTriggerAction extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeExternalField("trigger_name", array("allowed_values"=>null, "extkey_attcode"=> 'trigger_id', "target_attcode"=>"description"))); MetaModel::Init_AddAttribute(new AttributeInteger("order", array("allowed_values"=>null, "sql"=>"order", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddFilterFromAttribute("action_id"); - MetaModel::Init_AddFilterFromAttribute("trigger_id"); - MetaModel::Init_AddFilterFromAttribute("order"); - // Display lists MetaModel::Init_SetZListItems('details', array('action_id', 'trigger_id', 'order')); // Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('action_name', 'trigger_name', 'order')); // Attributes to be displayed for a list