From 8dc54117170cdfe096a19e97df2e81b44ddfbb83 Mon Sep 17 00:00:00 2001 From: v-dumas Date: Mon, 13 Jan 2025 12:06:50 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B07906=20-=20User=20Preference:=20friendly?= =?UTF-8?q?name,=20list,=20search=20criteria=20and=20reconciliation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/user.preferences.class.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/application/user.preferences.class.inc.php b/application/user.preferences.class.inc.php index ed1325d2a..dd1c8f322 100644 --- a/application/user.preferences.class.inc.php +++ b/application/user.preferences.class.inc.php @@ -249,9 +249,9 @@ class appUserPreferences extends DBObject ( "category" => "gui", "key_type" => "autoincrement", - "name_attcode" => "userid", + "name_attcode" => "login", "state_attcode" => "", - "reconc_keys" => array("userid"), + "reconc_keys" => array("userid","login"), "db_table" => "priv_app_preferences", "db_key_field" => "id", "db_finalclass_field" => "", @@ -260,8 +260,10 @@ class appUserPreferences extends DBObject MetaModel::Init_Params($aParams); MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributePropertySet("preferences", array("allowed_values"=>null, "sql"=>"preferences", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_SetZListItems('list', array('preferences',)); - MetaModel::Init_SetZListItems('default_search', array('userid')); + MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "org_id"))); + MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values" => null, "extkey_attcode" => 'userid', "target_attcode" => "login"))); + MetaModel::Init_SetZListItems('list', array('org_id','preferences')); + MetaModel::Init_SetZListItems('default_search', array('userid','login','org_id')); } /**