Could not easily attach a profile to a user (idem with notifications, etc.)

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

addons/userrights/userrightsprofile.class.inc.php

@@ -80,10 +80,10 @@ class URP_Users extends UserRightsBaseClass
 		//MetaModel::Init_AddAttribute(new AttributeString("language", array("allowed_values"=>array('EN US,FR FR'), "sql"=>"language", "default_value"=>"EN US", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>"EN US", "is_null_allowed"=>false, "depends_on"=>array())));
 
-		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_AddAttribute(new AttributeLinkedSetIndirect("profile_list", 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())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'first_name', 'email', 'login', 'language')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('userid', 'first_name', 'email', 'login', 'language', 'profile_list')); // 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
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('login', 'userid')); // Criteria of the std search form
@@ -201,10 +201,10 @@ class URP_Profiles extends UserRightsBaseClass
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		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 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_AddAttribute(new AttributeLinkedSetIndirect("user_list", 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())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form

core/action.class.inc.php

@@ -52,10 +52,10 @@ abstract class Action extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		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_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", 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())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form

core/trigger.class.inc.php

@@ -51,10 +51,10 @@ class Trigger extends cmdbAbstractObject
 		//MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
-		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_AddAttribute(new AttributeLinkedSetIndirect("action_list", 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())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('finalclass', 'description')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass')); // Attributes to be displayed for a list
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form

dictionaries/dictionary.itop.core.php

@@ -243,8 +243,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Action/Attribute:status/Value:enabled+' => 'In production',
 	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
 	'Class:Action/Attribute:status/Value:disabled+' => 'Inactive',
-	'Class:Action/Attribute:related_triggers' => 'Related Triggers',
-	'Class:Action/Attribute:related_triggers+' => 'Triggers linked to this action',
+	'Class:Action/Attribute:trigger_list' => 'Related Triggers',
+	'Class:Action/Attribute:trigger_list+' => 'Triggers linked to this action',
 	'Class:Action/Attribute:finalclass' => 'Type',
 	'Class:Action/Attribute:finalclass+' => '',
 ));

dictionaries/dictionary.itop.ui.php

@@ -139,8 +139,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:URP_Users/Attribute:language/Value:EN US+' => 'English U.S.',
 	'Class:URP_Users/Attribute:language/Value:FR FR' => 'French',
 	'Class:URP_Users/Attribute:language/Value:FR FR+' => 'FR FR',
-	'Class:URP_Users/Attribute:profiles' => 'Profiles',
-	'Class:URP_Users/Attribute:profiles+' => 'roles, granting rights for that person',
+	'Class:URP_Users/Attribute:profile_list' => 'Profiles',
+	'Class:URP_Users/Attribute:profile_list+' => 'Roles, granting rights for that person',
 ));
 
 //
@@ -148,14 +148,14 @@ Dict::Add('EN US', 'English', 'English', array(
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_Profiles' => 'profile',
-	'Class:URP_Profiles+' => 'usage profiles',
+	'Class:URP_Profiles' => 'Profile',
+	'Class:URP_Profiles+' => 'User profile',
 	'Class:URP_Profiles/Attribute:name' => 'Name',
 	'Class:URP_Profiles/Attribute:name+' => 'label',
 	'Class:URP_Profiles/Attribute:description' => 'Description',
 	'Class:URP_Profiles/Attribute:description+' => 'one line description',
-	'Class:URP_Profiles/Attribute:users' => 'Users',
-	'Class:URP_Profiles/Attribute:users+' => 'persons having this role',
+	'Class:URP_Profiles/Attribute:user_list' => 'Users',
+	'Class:URP_Profiles/Attribute:user_list+' => 'persons having this role',
 ));
 
 //
@@ -722,29 +722,29 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:ConfigurationManagementMenu:Title' => 'Infrastructure Overview',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
-
-'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items by status',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items by type',
-
-'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Request Management',
-'UI-RequestManagementOverview-RequestByService' => 'User Requests by service',
-'UI-RequestManagementOverview-RequestByPriority' => 'User Requests by priority',
-'UI-RequestManagementOverview-RequestUnassigned' => 'User Requests not yet assigned to an agent',
-
-'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
-'UI-IncidentManagementOverview-IncidentByService' => 'Incidents by service',
-'UI-IncidentManagementOverview-IncidentByPriority' => 'Incident by priority',
-'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents not yet assigned to an agent',
-
-'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management',
-'UI-ChangeManagementOverview-ChangeByType' => 'Changes by type',
-'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes not yet assigned to an agent',
-'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages due to changes',
-
-'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Customer contracts to be renewed in 30 days',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider contracts to be renewed in 30 days',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items by status',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items by type',
+
+'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Request Management',
+'UI-RequestManagementOverview-RequestByService' => 'User Requests by service',
+'UI-RequestManagementOverview-RequestByPriority' => 'User Requests by priority',
+'UI-RequestManagementOverview-RequestUnassigned' => 'User Requests not yet assigned to an agent',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
+'UI-IncidentManagementOverview-IncidentByService' => 'Incidents by service',
+'UI-IncidentManagementOverview-IncidentByPriority' => 'Incident by priority',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents not yet assigned to an agent',
+
+'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management',
+'UI-ChangeManagementOverview-ChangeByType' => 'Changes by type',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes not yet assigned to an agent',
+'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages due to changes',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Customer contracts to be renewed in 30 days',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider contracts to be renewed in 30 days',
 
 	'UI:ContactsMenu' => 'Contacts',
 	'UI:ContactsMenu+' => 'Contacts',

dictionaries/fr.dictionary.itop.ui.php

@@ -133,8 +133,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_Users/Attribute:login+' => 'user identification string',
 	'Class:URP_Users/Attribute:password' => 'Password',
 	'Class:URP_Users/Attribute:password+' => 'user authentication string',
-	'Class:URP_Users/Attribute:profiles' => 'Profiles',
-	'Class:URP_Users/Attribute:profiles+' => 'roles, granting rights for that person',
+	'Class:URP_Users/Attribute:profile_list' => 'Profiles',
+	'Class:URP_Users/Attribute:profile_list+' => 'roles, granting rights for that person',
 ));
 
 //
@@ -142,14 +142,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_Profiles' => 'profile',
-	'Class:URP_Profiles+' => 'usage profiles',
+	'Class:URP_Profiles' => 'Profil',
+	'Class:URP_Profiles+' => 'Profil utilisateur',
 	'Class:URP_Profiles/Attribute:name' => 'Name',
 	'Class:URP_Profiles/Attribute:name+' => 'label',
 	'Class:URP_Profiles/Attribute:description' => 'Description',
 	'Class:URP_Profiles/Attribute:description+' => 'one line description',
-	'Class:URP_Profiles/Attribute:users' => 'Users',
-	'Class:URP_Profiles/Attribute:users+' => 'persons having this role',
+	'Class:URP_Profiles/Attribute:user_list' => 'Users',
+	'Class:URP_Profiles/Attribute:user_list+' => 'persons having this role',
 ));
 
 //