mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 01:43:32 +02:00
Code Issues Projects Releases Wiki Activity

MDL-83718 reportbuilder: use aliased user fullname sort fields.

Browse Source 
This is extending work started in 8f32e623 that removed duplicate
fields when sorting user fullname columns (to ensure compatibility
across supported DBs).

We must now refer to these sorted fields by their alias in order to
ensure they continue working when processed from the report table.

Co-authored-by: David Carrillo <davidmc@moodle.com>
This commit is contained in:
Paul Holden 2024-12-03 12:53:22 +00:00
parent 321e04d630
commit e76d99f29d
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
reportbuilder/classes/table/base_report_table.php
View File

@ -214,7 +214,7 @@ abstract class base_report_table extends table_sql implements dynamic, renderabl
*/
public function get_sql_sort() {
$columnsbyalias = $this->report->get_active_columns_by_alias();
$columnsortby = [];
$columnsortby = $columnsortbyalias = [];
// First pass over sorted columns, to extract all the fullname fields from table_sql.
$sortedcolumns = $this->get_sort_columns();
@ -239,14 +239,20 @@ abstract class base_report_table extends table_sql implements dynamic, renderabl
}
// Now ensure that any fullname sorted columns have duplicated aliases removed.
$columnsortby = array_filter($columnsortby, static function(string $alias) use ($sortedcolumnsfullname): bool {
if (preg_match('/^c[\d]+_(?<column>.*)$/', $alias, $matches)) {
return !array_key_exists($matches['column'], $sortedcolumnsfullname);
foreach ($columnsortby as $sortfield => $dir) {
if (array_key_exists($sortfield, $sortedcolumnsfullname)) {
$sortfieldalias = array_filter(
$columnsortby,
fn(string $key) => preg_match("/^c[\d]+_{$sortfield}$/", $key),
ARRAY_FILTER_USE_KEY,
);
$columnsortbyalias[array_key_first($sortfieldalias)] = $dir;
} else if (!array_key_exists($sortfield, $columnsortbyalias)) {
$columnsortbyalias[$sortfield] = $dir;
}
return true;
}, ARRAY_FILTER_USE_KEY);
}
return static::construct_order_by($columnsortby);
return static::construct_order_by($columnsortbyalias);
}
/**