Cleanup: obsolescence of "key_label" property on persistent classes

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@473 a333f486-631f-4898-b8df-5754b55c2be0

addons/userrights/userrightsmatrix.class.inc.php

@@ -31,7 +31,6 @@ class UserRightsMatrixUsers extends DBObject
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "login",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -55,7 +54,6 @@ class UserRightsMatrixClassGrant extends DBObject
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -82,7 +80,6 @@ class UserRightsMatrixClassStimulusGrant extends DBObject
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -109,7 +106,6 @@ class UserRightsMatrixAttributeGrant extends DBObject
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

addons/userrights/userrightsprofile.class.inc.php

@@ -58,7 +58,6 @@ class URP_Users extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "login",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -189,7 +188,6 @@ class URP_Profiles extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -296,7 +294,6 @@ class URP_Dimensions extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -410,7 +407,6 @@ class URP_UserProfile extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "userid",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -452,7 +448,6 @@ class URP_ProfileProjection extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "profileid",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -525,7 +520,6 @@ class URP_ClassProjection extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "dimensionid",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -601,7 +595,6 @@ class URP_ActionGrant extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "profileid",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -639,7 +632,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "profileid",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -677,7 +669,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
 		(
 			"category" => "addon/userrights",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "actiongrantid",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

application/audit.category.class.inc.php

@@ -35,7 +35,6 @@ class AuditCategory extends cmdbAbstractObject
 		(
 			"category" => "application",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array('name'),

application/audit.rule.class.inc.php

@@ -36,7 +36,6 @@ class AuditRule extends cmdbAbstractObject
 		(
 			"category" => "application",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array('name'),

application/cmdbabstract.class.inc.php

@@ -571,7 +571,7 @@ abstract class cmdbAbstractObject extends CMDBObject
 					$aList[$sClassName][$sAttCode] = $oAttDef;
 				}
 			}
-			$aHeader[] = MetaModel::GetKeyLabel($sClassName);
+			$aHeader[] = 'id';
 			foreach($aList[$sClassName] as $sAttCode => $oAttDef)
 			{
 				if ($oAttDef->IsExternalField())

application/iotask.class.inc.php

@@ -37,7 +37,6 @@ class InputOutputTask extends cmdbAbstractObject
 		(
 			"category" => "application",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

application/menunode.class.inc.php

@@ -48,7 +48,6 @@ class menuNode extends DBObject
 		(
 			"category" => "gui",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

application/transaction.class.inc.php

@@ -39,7 +39,6 @@ class privUITransaction extends DBObject
 		(
 			"category" => "gui",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "expiration_date",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

business/ChangeMgmt.business.php

@@ -36,7 +36,6 @@ class bizChangeTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",  
 			"state_attcode" => "ticket_status",
 			"reconc_keys" => array("title"),
@@ -213,7 +212,6 @@ class lnkInfraChangeTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "impact",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("impact"),  // ????
@@ -257,7 +255,6 @@ class lnkContactChange extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "role",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("role"),  // ????

business/KEDB.business.php

@@ -37,7 +37,6 @@ class bizKnownError extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -93,7 +92,6 @@ class lnkInfraError extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("infra_id","error_id"),  // ????
@@ -133,7 +131,6 @@ class lnkDocumentError extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "link_type",
 			"state_attcode" => "",
 			"reconc_keys" => array("doc_name", "error_name"),

business/ServiceDesk.business.php

@@ -36,7 +36,6 @@ class bizServiceCall extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",  
 			"state_attcode" => "call_status",
 			"reconc_keys" => array("title"),
@@ -171,7 +170,6 @@ class lnkCallTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "impact",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("impact"),  // ????
@@ -217,7 +215,6 @@ class lnkInfraCall extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "impact",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("impact"),  // ????

business/ServiceMgmt.business.php

@@ -36,7 +36,6 @@ class bizService extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			//"state_attcode" => "status",
 			"state_attcode" => "",
@@ -107,7 +106,6 @@ class bizContract extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			//"state_attcode" => "status",
 			"state_attcode" => "",
@@ -203,7 +201,6 @@ class lnkInfraContract extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "coverage",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("infra_id","contract_id"),  // ????
@@ -244,7 +241,6 @@ class lnkContactContract extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "role",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("role"),  // ????
@@ -289,7 +285,6 @@ class lnkDocumentContract extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "link_type",
 			"state_attcode" => "",
 			"reconc_keys" => array("doc_name", "contract_name"),

business/ServiceRequest.business.php

@@ -37,7 +37,6 @@ class bizServiceRequest extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -114,7 +113,6 @@ class bizServiceItem extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("request_id", "name"), // inherited attributes

business/incidentMgmt.business.php

@@ -36,7 +36,6 @@ class bizIncidentTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",  
 			"state_attcode" => "ticket_status",
 			"reconc_keys" => array("title"),
@@ -213,7 +212,6 @@ class lnkRelatedTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "impact",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("impact"),  // ????
@@ -259,7 +257,6 @@ class lnkInfraTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "impact",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("impact"),  // ????
@@ -305,7 +302,6 @@ class lnkContactTicket extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "role",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("role"),  // ????
@@ -350,7 +346,6 @@ class bizWorkgroup extends logRealObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_name", "name"), // inherited attributes

business/itop.business.class.inc.php

@@ -37,6 +37,49 @@ define('STANDARD_STATUSES', 'production,implementation,obsolete');
  */
 MetaModel::RegisterRelation("impacts");
 
+class classetest extends cmdbObject
+{
+
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"key_type" => "automincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array("name"),
+			"db_table" => "myclasstable",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeString("aaaa", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("b", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEmailAddress("c", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeIPAddress("d", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributePassword("e", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("f", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("g", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBoolean("h", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("i", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("j", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBlob("k", array("depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributePropertySet("l", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTable("m", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("n", array("targetclass"=>"bizOrganization", "jointype"=>null, "allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("o", array("allowed_values"=>null, "extkey_attcode"=>"n", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("p", array("linked_class"=>"class_to_be_defined", "ext_key_to_me"=>"attribute_to_be_defined", "ext_key_to_remote"=>"attribute_to_be_defined", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("q", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("r", array("class_category"=>"bizmodel", "more_values"=>"myvalue1,myvalue2,myvalue3", "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTemplateString("s", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTemplateText("t", array("allowed_values"=>null, "sql"=>"mysqlcolumn_to_be_defined", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+}
+
 ////////////////////////////////////////////////////////////////////////////////////
 /**
 * An organization that owns some objects
@@ -57,7 +100,6 @@ class bizOrganization extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("name"),
@@ -111,7 +153,6 @@ class logRealObject extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("name"),
@@ -158,7 +199,6 @@ class bizContact extends logRealObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -207,7 +247,6 @@ class bizPerson extends bizContact
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "first_name", "name"),  // comment en définir plusieurs
@@ -254,7 +293,6 @@ class bizTeam extends bizContact
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -287,7 +325,6 @@ class lnkContactTeam extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "role",
 			"state_attcode" => "",
 			"reconc_keys" => array("contact_id", "team_name"),
@@ -326,7 +363,6 @@ class bizDocument extends logRealObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -369,7 +405,6 @@ class lnkDocumentRealObject extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "link_type",
 			"state_attcode" => "",
 			"reconc_keys" => array("doc_id", "object_name"),
@@ -407,7 +442,6 @@ class lnkContactRealObject extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "role",
 			"state_attcode" => "",
 			"reconc_keys" => array("contact_id", "object_name"),
@@ -448,7 +482,6 @@ abstract class logInfra extends logRealObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -477,7 +510,6 @@ class lnkContactInfra extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "role",
 			"state_attcode" => "",
 			"reconc_keys" => array("contact_id", "infra_id"),
@@ -516,7 +548,6 @@ class bizLocation extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -638,7 +669,6 @@ class bizCircuit extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "provider_id", "carrier_ref", "name"), // inherited attributes
@@ -709,7 +739,6 @@ class bizInterface extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "device_id", "name"),
@@ -793,7 +822,6 @@ class bizSubnet extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -877,7 +905,6 @@ class bizDevice extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -938,7 +965,6 @@ class bizPC extends bizDevice
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -1022,7 +1048,6 @@ class bizServer extends bizDevice
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			//"state_attcode" => "status",
 			"state_attcode" => "",
@@ -1181,7 +1206,6 @@ class bizNetworkDevice extends bizDevice
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -1239,7 +1263,6 @@ class bizInfraGroup extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("org_id", "name"), // inherited attributes
@@ -1313,7 +1336,6 @@ class bizApplication extends logInfra
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("device_id", "name"), // inherited attributes
@@ -1383,7 +1405,6 @@ class lnkInfraGrouping extends cmdbAbstractObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "impact", 
 			"state_attcode" => "",
 			"reconc_keys" => array(""),
@@ -1435,7 +1456,6 @@ class lnkClientServer extends logRealObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "autoincrement",
-			"key_label" => "link_id",
 			"name_attcode" => "relation",  // ????
 			"state_attcode" => "",
 			"reconc_keys" => array("relation"),  // ????
@@ -1477,7 +1497,6 @@ class bizPatch extends logRealObject
 		(
 			"category" => "bizmodel,searchable",
 			"key_type" => "",
-			"key_label" => "id",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array("device_id", "name"), // inherited attributes

business/test_farm.class.inc.php

@@ -43,7 +43,6 @@ class Animal extends cmdbObject
 		(
 			"category" => "blah",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(""),
@@ -70,7 +69,6 @@ class Mammal extends Animal
 		(
 			"category" => "blah",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -95,7 +93,6 @@ class Bird extends Animal
 		(
 			"category" => "blah",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -117,7 +114,6 @@ class WalkingBird extends Bird
 		(
 			"category" => "blah",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -139,7 +135,6 @@ class FlyingBird extends Bird
 		(
 			"category" => "blah",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -162,7 +157,6 @@ class AnimalRelation extends cmdbObject
 		(
 			"category" => "blah",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -188,7 +182,6 @@ class EaterToEaten extends AnimalRelation
 		(
 			"category" => "blah",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -210,7 +203,6 @@ class Group extends cmdbObject
 		(
 			"category" => "blah",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

core/action.class.inc.php

@@ -39,7 +39,6 @@ abstract class Action extends cmdbAbstractObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -104,7 +103,6 @@ abstract class ActionNotification extends Action
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -138,7 +136,6 @@ class ActionEmail extends ActionNotification
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

core/attributedef.class.inc.php

@@ -936,6 +936,7 @@ class AttributeEnum extends AttributeString
 	public function GetAllowedValues($aArgs = array(), $sBeginsWith = '')
 	{
 		$aRawValues = parent::GetAllowedValues($aArgs, $sBeginsWith);
+		if (is_null($aRawValues)) return null;
 		$aLocalizedValues = array();
 		foreach ($aRawValues as $sKey => $sValue)
 		{

core/cmdbchange.class.inc.php

@@ -37,7 +37,6 @@ class CMDBChange extends DBObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "date",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

core/cmdbchangeop.class.inc.php

@@ -38,7 +38,6 @@ class CMDBChangeOp extends DBObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -87,7 +86,6 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 		(
 			"category" => "core/cmdb",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -122,7 +120,6 @@ class CMDBChangeOpDelete extends CMDBChangeOp
 		(
 			"category" => "core/cmdb",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -156,7 +153,6 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp
 		(
 			"category" => "core/cmdb",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -187,7 +183,6 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		(
 			"category" => "core/cmdb",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -278,7 +273,6 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 		(
 			"category" => "core/cmdb",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -339,7 +333,6 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 		(
 			"category" => "core/cmdb",
 			"key_type" => "",
-			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

core/dbobject.class.php

@@ -320,8 +320,11 @@ abstract class DBObject
 				return;
 			}
 		}
-		$this->m_aCurrValues[$sAttCode] = $oAttDef->MakeRealValue($value);
-		$this->RegisterAsDirty(); // Make sure we do not reload it anymore... before saving it
+		if ($oAttDef->CheckValue($value))
+		{
+			$this->m_aCurrValues[$sAttCode] = $oAttDef->MakeRealValue($value);
+			$this->RegisterAsDirty(); // Make sure we do not reload it anymore... before saving it
+		}
 	}
 	
 	public function Get($sAttCode)

core/event.class.inc.php

@@ -33,7 +33,6 @@ class Event extends cmdbAbstractObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -70,7 +69,6 @@ class EventNotification extends Event
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -103,7 +101,6 @@ class EventNotificationEmail extends EventNotification
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -140,7 +137,6 @@ class EventIssue extends Event
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -240,7 +236,6 @@ class EventWebService extends Event
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),

core/metamodel.class.php

@@ -304,11 +304,6 @@ abstract class MetaModel
 		self::_check_subclass($sClass);	
 		return (self::$m_aClassParams[$sClass]["key_type"] == "autoincrement");
 	}
-	final static public function GetKeyLabel($sClass)
-	{
-		self::_check_subclass($sClass);	
-		return self::$m_aClassParams[$sClass]["key_label"];
-	}
 	final static public function GetNameAttributeCode($sClass)
 	{
 		self::_check_subclass($sClass);	
@@ -725,7 +720,7 @@ abstract class MetaModel
 	//
 	private static $m_aRelationInfos = array(); // array of ("relcode" => various info on the list, common to every classes)
 
-	public static function EnumRelations()
+	public static function EnumRelations($sClass = '')
 	{
 		return array_keys(self::$m_aRelationInfos);
 	}
@@ -1046,7 +1041,6 @@ abstract class MetaModel
 		$aMandatParams = array(
 			"category" => "group classes by modules defining their visibility in the UI",
 			"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",
 			"state_attcode" => "define wich attribute is representing the state (object lifecycle)",
 			"reconc_keys" => "define the attributes that will 'almost uniquely' identify an object in batch processes",

core/trigger.class.inc.php

@@ -39,7 +39,6 @@ class Trigger extends cmdbAbstractObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "description",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -86,7 +85,6 @@ class TriggerOnObject extends Trigger
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "description",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -116,7 +114,6 @@ class TriggerOnStateChange extends TriggerOnObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "description",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -146,7 +143,6 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "description",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -175,7 +171,6 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "description",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -204,7 +199,6 @@ class TriggerOnObjectCreate extends TriggerOnObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "",
 			"name_attcode" => "description",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -233,7 +227,6 @@ class lnkTriggerAction extends cmdbAbstractObject
 		(
 			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
-			"key_label" => "Link ID",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(""),

pages/ITopConsultant.php

@@ -60,7 +60,6 @@ function ShowClass($sClass, $sBaseArgs)
 
 	$aProps["Description"] = MetaModel::GetClassDescription($sClass);
 	$aProps["Autoincrement id?"] = MetaModel::IsAutoIncrementKey($sClass);
-	$aProps["Key label"] = MetaModel::GetKeyLabel($sClass);
 	$aProps["Name attribute"] = MetaModel::GetNameAttributeCode($sClass);
 	$aProps["Reconciliation keys"] = implode(", ", MetaModel::GetReconcKeys($sClass));
 	$aProps["DB key column"] = MetaModel::DBGetKey($sClass);