L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-82475 reportbuilder: account for duplicate profile field names.

Browse Source 
Long-term, it would be better to not allow this scenario to happen
at all but until then we'll have to work around it (see MDL-73461).
This commit is contained in:
Paul Holden
2024-10-16 09:33:22 +01:00
parent b48e64e2a1
commit 92b27a6f07
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reportbuilder/classes/local/helpers/user_profile_fields.php
+8 -6
View File
@@ -166,8 +166,9 @@ class user_profile_fields {
$columnfieldsql = $DB->sql_order_by_text($columnfieldsql, 1024);
}
$columns[] = (new column(
'profilefield_' . core_text::strtolower($profilefield->field->shortname),
$columnname = 'profilefield_' . core_text::strtolower($profilefield->field->shortname);
$columns[$columnname] = (new column(
$columnname,
new lang_string('customfieldcolumn', 'core_reportbuilder', $profilefield->display_name(false)),
$this->entityname
))
@@ -186,7 +187,7 @@ class user_profile_fields {
}, $profilefield);
}
return $columns;
return array_values($columns);
}
/**
@@ -231,9 +232,10 @@ class user_profile_fields {
break;
}
$filtername = 'profilefield_' . core_text::strtolower($profilefield->field->shortname);
$filter = (new filter(
$classname,
'profilefield_' . core_text::strtolower($profilefield->field->shortname),
$filtername,
new lang_string('customfieldcolumn', 'core_reportbuilder', $profilefield->display_name(false)),
$this->entityname,
$fieldsql,
@@ -247,10 +249,10 @@ class user_profile_fields {
$filter->set_options($profilefield->options);
}
$filters[] = $filter;
$filters[$filtername] = $filter;
}
return $filters;
return array_values($filters);
}
/**
reportbuilder/tests/local/helpers/user_profile_fields_test.php
+14
View File
@@ -94,6 +94,13 @@ class user_profile_fields_test extends core_reportbuilder_testcase {
return $column->get_type();
}, $initialcolumns);
// Create a field which will duplicate one of the subsequently generated fields (case-insensitive shortname).
$this->getDataGenerator()->create_custom_profile_field([
'shortname' => 'CHECKBOX',
'name' => 'Duplicate checkbox field',
'datatype' => 'checkbox',
]);
// Add new custom profile fields.
$userprofilefields = $this->generate_userprofilefields();
$columns = $userprofilefields->get_columns();
@@ -177,6 +184,13 @@ class user_profile_fields_test extends core_reportbuilder_testcase {
return $filter->get_header();
}, $initialfilters);
// Create a field which will duplicate one of the subsequently generated fields (case-insensitive shortname).
$this->getDataGenerator()->create_custom_profile_field([
'shortname' => 'CHECKBOX',
'name' => 'Duplicate checkbox field',
'datatype' => 'checkbox',
]);
// Add new custom profile fields.
$userprofilefields = $this->generate_userprofilefields();
$filters = $userprofilefields->get_filters();