From 018da0ddf474a09b51fb1350e7b7a4b60a6476f8 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Tue, 20 Apr 2010 15:54:13 +0000 Subject: [PATCH] Localization: cleanup in data model class declarations SVN:trunk[355] --- .../userrights/userrightsmatrix.class.inc.php | 8 ---- .../userrightsprofile.class.inc.php | 18 ------- application/audit.category.class.inc.php | 2 - application/audit.rule.class.inc.php | 2 - application/iotask.class.inc.php | 2 - application/menunode.class.inc.php | 2 - business/ChangeMgmt.business.php | 6 --- business/KEDB.business.php | 6 --- business/ServiceDesk.business.php | 6 --- business/ServiceMgmt.business.php | 10 ---- business/ServiceRequest.business.php | 4 -- business/business_itopbegins.class.inc.php | 12 ----- business/business_test.class.inc.php | 12 ----- business/incidentMgmt.business.php | 10 ---- business/itop.business.class.inc.php | 48 ------------------- business/test_farm.class.inc.php | 16 ------- core/action.class.inc.php | 6 --- core/cmdbchange.class.inc.php | 2 - core/cmdbchangeop.class.inc.php | 14 ------ core/event.class.inc.php | 10 ---- core/metamodel.class.php | 6 --- core/trigger.class.inc.php | 14 ------ 22 files changed, 216 deletions(-) diff --git a/addons/userrights/userrightsmatrix.class.inc.php b/addons/userrights/userrightsmatrix.class.inc.php index c114fc353..8bf75fb22 100644 --- a/addons/userrights/userrightsmatrix.class.inc.php +++ b/addons/userrights/userrightsmatrix.class.inc.php @@ -21,8 +21,6 @@ class UserRightsMatrixUsers extends DBObject $aParams = array ( "category" => "addon/userrights", - "name" => "user", - "description" => "users and credentials", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "login", @@ -51,8 +49,6 @@ class UserRightsMatrixClassGrant extends DBObject $aParams = array ( "category" => "addon/userrights", - "name" => "class_permission", - "description" => "permissions on classes", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -86,8 +82,6 @@ class UserRightsMatrixClassStimulusGrant extends DBObject $aParams = array ( "category" => "addon/userrights", - "name" => "stimulus_permission", - "description" => "permissions on stimilus in the life cycle of the object", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -121,8 +115,6 @@ class UserRightsMatrixAttributeGrant extends DBObject $aParams = array ( "category" => "addon/userrights", - "name" => "attribute_permission", - "description" => "permissions at the attributes level", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index bb89718d4..c85c36832 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -47,8 +47,6 @@ class URP_Users extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "user", - "description" => "users and credentials", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "login", @@ -182,8 +180,6 @@ class URP_Profiles extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "profile", - "description" => "usage profiles", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", @@ -291,8 +287,6 @@ class URP_Dimensions extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "dimension", - "description" => "application dimension (defining silos)", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", @@ -412,8 +406,6 @@ class URP_UserProfile extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "User to profile", - "description" => "user profiles", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "userid", @@ -460,8 +452,6 @@ class URP_ProfileProjection extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "profile_projection", - "description" => "profile projections", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "profileid", @@ -540,8 +530,6 @@ class URP_ClassProjection extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "class_projection", - "description" => "class projections", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "dimensionid", @@ -624,8 +612,6 @@ class URP_ActionGrant extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "action_permission", - "description" => "permissions on classes", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "profileid", @@ -673,8 +659,6 @@ class URP_StimulusGrant extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "stimulus_permission", - "description" => "permissions on stimilus in the life cycle of the object", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "profileid", @@ -722,8 +706,6 @@ class URP_AttributeGrant extends UserRightsBaseClass $aParams = array ( "category" => "addon/userrights", - "name" => "attribute_permission", - "description" => "permissions at the attributes level", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "actiongrantid", diff --git a/application/audit.category.class.inc.php b/application/audit.category.class.inc.php index 85b203ea7..3a96411c0 100644 --- a/application/audit.category.class.inc.php +++ b/application/audit.category.class.inc.php @@ -13,8 +13,6 @@ class AuditCategory extends cmdbAbstractObject $aParams = array ( "category" => "application", - "name" => "AuditCategory", - "description" => "A section inside the overall audit", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", diff --git a/application/audit.rule.class.inc.php b/application/audit.rule.class.inc.php index f00f7c43b..92230ce7d 100644 --- a/application/audit.rule.class.inc.php +++ b/application/audit.rule.class.inc.php @@ -14,8 +14,6 @@ class AuditRule extends cmdbAbstractObject $aParams = array ( "category" => "application", - "name" => "AuditRule", - "description" => "A rule to check for a given Audit category", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", diff --git a/application/iotask.class.inc.php b/application/iotask.class.inc.php index 8ca3b3f37..7314ccf5a 100644 --- a/application/iotask.class.inc.php +++ b/application/iotask.class.inc.php @@ -12,8 +12,6 @@ class InputOutputTask extends cmdbAbstractObject $aParams = array ( "category" => "application", - "name" => "IOTask", - "description" => "Input / Output Task for synchronizing information with external data sources", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index f48517ae9..6f17e3986 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -23,8 +23,6 @@ class menuNode extends DBObject $aParams = array ( "category" => "gui", - "name" => "menuNode", - "description" => "Main menu configuration elements", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", diff --git a/business/ChangeMgmt.business.php b/business/ChangeMgmt.business.php index 26bc5f04c..f2afe2287 100644 --- a/business/ChangeMgmt.business.php +++ b/business/ChangeMgmt.business.php @@ -11,8 +11,6 @@ class bizChangeTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Change", - "description" => "Change ticket", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -214,8 +212,6 @@ class lnkInfraChangeTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Infra Change Ticket", - "description" => "Infra impacted by a Change ticket", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "impact", // ???? @@ -263,8 +259,6 @@ class lnkContactChange extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ContactChangeLink", - "description" => "Contact associated to a change", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "role", // ???? diff --git a/business/KEDB.business.php b/business/KEDB.business.php index 4dfcceffe..34822ea98 100644 --- a/business/KEDB.business.php +++ b/business/KEDB.business.php @@ -12,8 +12,6 @@ class bizKnownError extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Known Error", - "description" => "Error documented for a known issue", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -83,8 +81,6 @@ class lnkInfraError extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "InfraErrorLinks", - "description" => "Infra related to a known error", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "", // ???? @@ -128,8 +124,6 @@ class lnkDocumentError extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "DocumentsErrorLinks", - "description" => "A link between a document and a known error", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "link_type", diff --git a/business/ServiceDesk.business.php b/business/ServiceDesk.business.php index de312c33c..405066beb 100644 --- a/business/ServiceDesk.business.php +++ b/business/ServiceDesk.business.php @@ -25,8 +25,6 @@ class bizServiceCall extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ServiceCall", - "description" => "Service Call from customer", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -180,8 +178,6 @@ class lnkCallTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Call Ticket", - "description" => "Ticket related to a call", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "impact", // ???? @@ -231,8 +227,6 @@ class lnkInfraCall extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Infra Call", - "description" => "Infra concerned by a call", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "impact", // ???? diff --git a/business/ServiceMgmt.business.php b/business/ServiceMgmt.business.php index f733f9b76..eec09e628 100644 --- a/business/ServiceMgmt.business.php +++ b/business/ServiceMgmt.business.php @@ -12,8 +12,6 @@ class bizService extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Service", - "description" => "Service provided by an organization", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -92,8 +90,6 @@ class bizContract extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Contract", - "description" => "Contract signed by an organization", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -205,8 +201,6 @@ class lnkInfraContract extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "InfraContractLinks", - "description" => "Infra covered by a contract", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "coverage", // ???? @@ -252,8 +246,6 @@ class lnkContactContract extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ContactContractLink", - "description" => "Contact associated to a contract", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "role", // ???? @@ -302,8 +294,6 @@ class lnkDocumentContract extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "DocumentsContractLinks", - "description" => "A link between a document and another contract", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "link_type", diff --git a/business/ServiceRequest.business.php b/business/ServiceRequest.business.php index 4d1f3cc24..8532a4d05 100644 --- a/business/ServiceRequest.business.php +++ b/business/ServiceRequest.business.php @@ -15,8 +15,6 @@ class bizServiceRequest extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ServiceRequest", - "description" => "Service request", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -106,8 +104,6 @@ class bizServiceItem extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ServiceItem", - "description" => "Service Item", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", diff --git a/business/business_itopbegins.class.inc.php b/business/business_itopbegins.class.inc.php index 94444b79e..f9bb97d41 100644 --- a/business/business_itopbegins.class.inc.php +++ b/business/business_itopbegins.class.inc.php @@ -39,8 +39,6 @@ class cmdbContact extends CMDBObject $aParams = array ( "category" => "blah", - "name" => "klassContact", - "description" => "klass contact description", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "att_contact_name", @@ -81,8 +79,6 @@ class cmdbPerson extends cmdbContact $aParams = array ( "category" => "blah", - "name" => "klassPerson", - "description" => "klass person description", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "att_contact_name", @@ -119,8 +115,6 @@ class cmdbSubcontractor extends cmdbPerson $aParams = array ( "category" => "blah", - "name" => "klassSubcontractor", - "description" => "klass subcontractor description", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "att_contact_name", @@ -163,8 +157,6 @@ class cmdbCrowd extends cmdbObject $aParams = array ( "category" => "blah", - "name" => "klassCrowd", - "description" => "klass crowd description", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "att_crowd_peoplecount", @@ -200,8 +192,6 @@ class cmdbCompany extends cmdbCrowd $aParams = array ( "category" => "blah", - "name" => "klassCompany", - "description" => "klass company description", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "att_company_dunsnumber", @@ -237,8 +227,6 @@ class cmdbProvider extends cmdbCompany $aParams = array ( "category" => "blah", - "name" => "klassProvider", - "description" => "klass provider description", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "att_provider_ref", diff --git a/business/business_test.class.inc.php b/business/business_test.class.inc.php index 6781d6dec..3d1e0db7c 100644 --- a/business/business_test.class.inc.php +++ b/business/business_test.class.inc.php @@ -45,8 +45,6 @@ class cmdbObjectHomeMade extends cmdbObject $aParams = array ( "category" => "blah", - "name" => "anyObject", - "description" => "std object", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -89,8 +87,6 @@ class cmdbContact extends cmdbObjectHomeMade $aParams = array ( "category" => "blah", - "name" => "Contact", - "description" => "Un object que l'on peut communiquer avec", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", @@ -174,8 +170,6 @@ class cmdbTeam extends cmdbContact $aParams = array ( "category" => "blah", - "name" => "Equipado", - "description" => "Un regroupement de gens", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "email", @@ -232,8 +226,6 @@ class cmdbOrga extends cmdbObjectHomeMade $aParams = array ( "category" => "blah", - "name" => "Organization", - "description" => "Une entite qui possede des choses", "key_type" => "", "key_label" => "", "name_attcode" => "_name_", @@ -277,8 +269,6 @@ class cmdbLiens extends cmdbObjectHomeMade $aParams = array ( "category" => "blah", - "name" => "Liens_entre_contacts_et_workshop", - "description" => "Une entite qui lie des contacts et workshops", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "function", @@ -332,8 +322,6 @@ class cmdbWorkshop extends cmdbObjectHomeMade $aParams = array ( "category" => "blah", - "name" => "Workshop", - "description" => "Une entite qui pond des theories insensees", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "namitus", diff --git a/business/incidentMgmt.business.php b/business/incidentMgmt.business.php index 0be812012..ddaae7a75 100644 --- a/business/incidentMgmt.business.php +++ b/business/incidentMgmt.business.php @@ -25,8 +25,6 @@ class bizIncidentTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Incident", - "description" => "Incident ticket", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -222,8 +220,6 @@ class lnkRelatedTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Related Ticket", - "description" => "Ticket related to a ticket", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "impact", // ???? @@ -273,8 +269,6 @@ class lnkInfraTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Infra Ticket", - "description" => "Infra impacted by a ticket", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "impact", // ???? @@ -324,8 +318,6 @@ class lnkContactTicket extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Contact Ticket", - "description" => "Contacts to be notify for a ticket", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "role", // ???? @@ -374,8 +366,6 @@ class bizWorkgroup extends logRealObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Workgroup", - "description" => "Call tracking workgroup", "key_type" => "", "key_label" => "id", "name_attcode" => "name", diff --git a/business/itop.business.class.inc.php b/business/itop.business.class.inc.php index ac39a54e8..52d2a7b77 100644 --- a/business/itop.business.class.inc.php +++ b/business/itop.business.class.inc.php @@ -57,8 +57,6 @@ class bizOrganization extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Organization", - "description" => "Organizational structure: can be Company and/or Department", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -129,8 +127,6 @@ class logRealObject extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Object", - "description" => "Any CMDB object", "key_type" => "autoincrement", "key_label" => "id", "name_attcode" => "name", @@ -183,8 +179,6 @@ class bizContact extends logRealObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Contact", - "description" => "Contact", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -241,8 +235,6 @@ class bizPerson extends bizContact $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Person", - "description" => "Person", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -294,8 +286,6 @@ class bizTeam extends bizContact $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Team", - "description" => "A group of contacts", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -331,8 +321,6 @@ class lnkContactTeam extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "TeamsLinks", - "description" => "A link between a contact and a Team", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "role", @@ -378,8 +366,6 @@ class bizDocument extends logRealObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Document", - "description" => "Document", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -425,8 +411,6 @@ class lnkDocumentRealObject extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "DocumentsLinks", - "description" => "A link between a document and another object", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "link_type", @@ -471,8 +455,6 @@ class lnkContactRealObject extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ContactsLinks", - "description" => "A link between a contact and another object", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "role", @@ -520,8 +502,6 @@ class logInfra extends logRealObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Infra", - "description" => "Infrastructure real object", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -554,8 +534,6 @@ class lnkContactInfra extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ContactsInfraLinks", - "description" => "A link between a contact and an infrastructure", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "role", @@ -601,8 +579,6 @@ class bizLocation extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Location", - "description" => "Any type of location: Region, Country, City, Site, Building, Floor, Room, Rack,...", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -733,8 +709,6 @@ class bizCircuit extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Circuit", - "description" => "Any type of circuit", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -816,8 +790,6 @@ class bizInterface extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Interface", - "description" => "Interface", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -912,8 +884,6 @@ class bizSubnet extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Subnet", - "description" => "Logical or physical subnet", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -995,8 +965,6 @@ class bizDevice extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Device", - "description" => "Electronic devices", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -1066,8 +1034,6 @@ class bizPC extends bizDevice $aParams = array ( "category" => "bizmodel,searchable", - "name" => "PC", - "description" => "Personal Computers", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -1160,8 +1126,6 @@ class bizServer extends bizDevice $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Server", - "description" => "Computer Servers", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -1332,8 +1296,6 @@ class bizNetworkDevice extends bizDevice $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Network Device", - "description" => "A network device", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -1396,8 +1358,6 @@ class bizInfraGroup extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Infra Group", - "description" => "A group of infrastructure elements", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -1479,8 +1439,6 @@ class bizApplication extends logInfra $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Application", - "description" => "General application", "key_type" => "", "key_label" => "id", "name_attcode" => "name", @@ -1561,8 +1519,6 @@ class lnkInfraGrouping extends cmdbAbstractObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Infra Grouping", - "description" => "Infra part of an Infra Group", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "impact", @@ -1619,8 +1575,6 @@ class lnkClientServer extends logRealObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "ClientServerLinks", - "description" => "Link between client server application", "key_type" => "autoincrement", "key_label" => "link_id", "name_attcode" => "relation", // ???? @@ -1666,8 +1620,6 @@ class bizPatch extends logRealObject $aParams = array ( "category" => "bizmodel,searchable", - "name" => "Patch", - "description" => "Patch installed on infrastucture", "key_type" => "", "key_label" => "id", "name_attcode" => "name", diff --git a/business/test_farm.class.inc.php b/business/test_farm.class.inc.php index fbb844c21..15c230927 100644 --- a/business/test_farm.class.inc.php +++ b/business/test_farm.class.inc.php @@ -33,8 +33,6 @@ class Animal extends cmdbObject $aParams = array ( "category" => "blah", - "name" => "Animal", - "description" => "An animal", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -69,8 +67,6 @@ class Mammal extends Animal $aParams = array ( "category" => "blah", - "name" => "Mammal", - "description" => "An animal with some characteristics", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", @@ -104,8 +100,6 @@ class Bird extends Animal $aParams = array ( "category" => "blah", - "name" => "Bird", - "description" => "Un regroupement de gens", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -130,8 +124,6 @@ class WalkingBird extends Bird $aParams = array ( "category" => "blah", - "name" => "WalkingBird", - "description" => "A bird which nevers flies", "key_type" => "", "key_label" => "", "name_attcode" => "", @@ -155,8 +147,6 @@ class FlyingBird extends Bird $aParams = array ( "category" => "blah", - "name" => "FlyingBird", - "description" => "A bird which nevers flies", "key_type" => "", "key_label" => "", "name_attcode" => "", @@ -183,8 +173,6 @@ class AnimalRelation extends cmdbObject $aParams = array ( "category" => "blah", - "name" => "AnimalRelation", - "description" => "Link between two animals", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -215,8 +203,6 @@ class EaterToEaten extends AnimalRelation $aParams = array ( "category" => "blah", - "name" => "EaterToEaten", - "description" => "Animal 1 eats animal 2", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -242,8 +228,6 @@ class Group extends cmdbObject $aParams = array ( "category" => "blah", - "name" => "Group", - "description" => "Group of animals", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", diff --git a/core/action.class.inc.php b/core/action.class.inc.php index 64dbb60e3..d17424503 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -20,8 +20,6 @@ abstract class Action extends cmdbAbstractObject $aParams = array ( "category" => "core/cmdb", - "name" => "action", - "description" => "Custom action", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", @@ -97,8 +95,6 @@ abstract class ActionNotification extends Action $aParams = array ( "category" => "core/cmdb", - "name" => "notification", - "description" => "Notification (abstract)", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", @@ -141,8 +137,6 @@ class ActionEmail extends ActionNotification $aParams = array ( "category" => "core/cmdb", - "name" => "email notification", - "description" => "Action: Email notification", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "name", diff --git a/core/cmdbchange.class.inc.php b/core/cmdbchange.class.inc.php index d2ebfd780..9e1fd2113 100644 --- a/core/cmdbchange.class.inc.php +++ b/core/cmdbchange.class.inc.php @@ -18,8 +18,6 @@ class CMDBChange extends DBObject $aParams = array ( "category" => "core/cmdb", - "name" => "change", - "description" => "Changes tracking", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "date", diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php index a9ef0047e..324d41868 100644 --- a/core/cmdbchangeop.class.inc.php +++ b/core/cmdbchangeop.class.inc.php @@ -19,8 +19,6 @@ class CMDBChangeOp extends DBObject $aParams = array ( "category" => "core/cmdb", - "name" => "change operation", - "description" => "Change operations tracking", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "change", @@ -74,8 +72,6 @@ class CMDBChangeOpCreate extends CMDBChangeOp $aParams = array ( "category" => "core/cmdb", - "name" => "object creation", - "description" => "Object creation tracking", "key_type" => "", "key_label" => "", "name_attcode" => "change", @@ -118,8 +114,6 @@ class CMDBChangeOpDelete extends CMDBChangeOp $aParams = array ( "category" => "core/cmdb", - "name" => "object deletion", - "description" => "Object deletion tracking", "key_type" => "", "key_label" => "", "name_attcode" => "change", @@ -161,8 +155,6 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp $aParams = array ( "category" => "core/cmdb", - "name" => "object change", - "description" => "Object properties change tracking", "key_type" => "", "key_label" => "", "name_attcode" => "change", @@ -202,8 +194,6 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute $aParams = array ( "category" => "core/cmdb", - "name" => "property change", - "description" => "Object scalar properties change tracking", "key_type" => "", "key_label" => "", "name_attcode" => "change", @@ -304,8 +294,6 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute $aParams = array ( "category" => "core/cmdb", - "name" => "data change", - "description" => "data change tracking", "key_type" => "", "key_label" => "", "name_attcode" => "change", @@ -374,8 +362,6 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute $aParams = array ( "category" => "core/cmdb", - "name" => "text change", - "description" => "text change tracking", "key_type" => "", "key_label" => "", "name_attcode" => "change", diff --git a/core/event.class.inc.php b/core/event.class.inc.php index 56b20db41..8045c798b 100644 --- a/core/event.class.inc.php +++ b/core/event.class.inc.php @@ -18,8 +18,6 @@ class Event extends cmdbAbstractObject $aParams = array ( "category" => "core/cmdb", - "name" => "Log Event", - "description" => "An application internal event", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -56,8 +54,6 @@ class EventNotification extends Event $aParams = array ( "category" => "core/cmdb", - "name" => "Notification event", - "description" => "Trace of a notification that has been sent", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -96,8 +92,6 @@ class EventNotificationEmail extends EventNotification $aParams = array ( "category" => "core/cmdb", - "name" => "Email emission event", - "description" => "Trace of an email that has been sent", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -136,8 +130,6 @@ class EventIssue extends Event $aParams = array ( "category" => "core/cmdb", - "name" => "Issue event", - "description" => "Trace of an issue (warning, error, etc.)", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -179,8 +171,6 @@ class EventWebService extends Event $aParams = array ( "category" => "core/cmdb", - "name" => "Web service event", - "description" => "Trace of an web service call", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 2cad79919..cb8f3c65a 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -940,8 +940,6 @@ abstract class MetaModel // Check mandatory params $aMandatParams = array( "category" => "group classes by modules defining their visibility in the UI", - "name" => "internal class name, may be different than the PHP class name", - "description" => "detailed (though one line) description of the class", "key_type" => "autoincrement | string", "key_label" => "if set, then display the key as an attribute", "name_attcode" => "define wich attribute is the class name, may be an inherited attribute", @@ -953,10 +951,6 @@ abstract class MetaModel ); $sClass = self::GetCallersPHPClass("Init"); - if (!array_key_exists("name", $aParams)) - { - throw new CoreException("Declaration of class $sClass: missing name ({$aMandatParams["name"]})"); - } foreach($aMandatParams as $sParamName=>$sParamDesc) { diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php index cda984a0d..a1399721c 100644 --- a/core/trigger.class.inc.php +++ b/core/trigger.class.inc.php @@ -19,8 +19,6 @@ class Trigger extends cmdbAbstractObject $aParams = array ( "category" => "core/cmdb", - "name" => "trigger", - "description" => "Custom event handler", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "description", @@ -71,8 +69,6 @@ class TriggerOnObject extends Trigger $aParams = array ( "category" => "core/cmdb", - "name" => "Trigger on a class of objects", - "description" => "Trigger on a given class of objects", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -106,8 +102,6 @@ class TriggerOnStateChange extends TriggerOnObject $aParams = array ( "category" => "core/cmdb", - "name" => "Trigger on object state change", - "description" => "Trigger on object state change", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -141,8 +135,6 @@ class TriggerOnStateEnter extends TriggerOnStateChange $aParams = array ( "category" => "core/cmdb", - "name" => "Trigger on object entering a state", - "description" => "Trigger on object state change - entering", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -174,8 +166,6 @@ class TriggerOnStateLeave extends TriggerOnStateChange $aParams = array ( "category" => "core/cmdb", - "name" => "Trigger on object leaving a state", - "description" => "Trigger on object state change - leaving", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -207,8 +197,6 @@ class TriggerOnObjectCreate extends TriggerOnObject $aParams = array ( "category" => "core/cmdb", - "name" => "Trigger on object creation", - "description" => "Trigger on object creation of [a child class of] the given class", "key_type" => "autoincrement", "key_label" => "", "name_attcode" => "", @@ -240,8 +228,6 @@ class lnkTriggerAction extends cmdbAbstractObject $aParams = array ( "category" => "core/cmdb", - "name" => "Actions-Trigger", - "description" => "Link between a trigger and an action", "key_type" => "autoincrement", "key_label" => "Link ID", "name_attcode" => "",