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-72961 reportbuilder: more defensive usage of report elements.

Browse Source 
We should gracefully handle invalid element models that refer to
columns, filters, conditions that are no longer defined within the
report/entity they are linked to.
This commit is contained in:
Paul Holden 2021-11-01 14:01:24 +00:00
parent b16fc54103
commit 677c2df9d6
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
reportbuilder/classes/external/custom_report_columns_sorting_exporter.php vendored
View File

@ -93,11 +93,13 @@ class custom_report_columns_sorting_exporter extends exporter {
$reportid = $report->get_report_persistent()->get('id');
$activecolumns = column::get_records(['reportid' => $reportid], 'sortorder');
$sortablecolumns = array_filter($activecolumns, function(column $persistent) use($report) {
$column = $report->get_column($persistent->get('uniqueidentifier'))
->set_aggregation($persistent->get('aggregation'));
$sortablecolumns = array_filter($activecolumns, function(column $persistent) use($report): bool {
$column = $report->get_column($persistent->get('uniqueidentifier'));
if ($column === null) {
return false;
}
return $column && $column->get_is_sortable();
return $column->set_aggregation($persistent->get('aggregation'))->get_is_sortable();
});
$sortablecolumns = array_map(function(column $persistent) use ($report) {

16
reportbuilder/classes/external/custom_report_filters_exporter.php vendored
View File

@ -103,11 +103,11 @@ class custom_report_filters_exporter extends exporter {
/** @var base $report */
$report = $this->related['report'];
// Current filter instances contained in the report.
$filterinstances = filter::get_filter_records($report->get_report_persistent()->get('id'), 'filterorder');
// Current filters added to the report.
$filters = filter::get_filter_records($report->get_report_persistent()->get('id'), 'filterorder');
$filteridentifiers = array_map(static function(filter $filter): string {
return $filter->get('uniqueidentifier');
}, $filterinstances);
}, $filters);
$availablefilters = $activefilters = [];
@ -134,12 +134,16 @@ class custom_report_filters_exporter extends exporter {
}
// Populate active filters.
foreach ($filterinstances as $filter) {
$editable = new filter_heading_editable($filter->get('id'));
$filterinstances = $report->get_filter_instances();
foreach ($filters as $filter) {
$filterinstance = $filterinstances[$filter->get('uniqueidentifier')] ?? null;
if ($filterinstance === null) {
continue;
}
$filterinstance = $report->get_filter($filter->get('uniqueidentifier'));
$entityname = $filterinstance->get_entity_name();
$displayvalue = $filterinstance->get_header();
$editable = new filter_heading_editable($filter->get('id'));
$activefilters[] = [
'id' => $filter->get('id'),

5
reportbuilder/classes/form/condition.php
View File

@ -124,7 +124,10 @@ class condition extends dynamic_form {
$conditions = filter::get_condition_records($this->get_report()->get_report_persistent()->get('id'), 'filterorder');
foreach ($conditions as $condition) {
$conditioninstance = $conditioninstances[$condition->get('uniqueidentifier')];
$conditioninstance = $conditioninstances[$condition->get('uniqueidentifier')] ?? null;
if ($conditioninstance === null) {
continue;
}
$entityname = $conditioninstance->get_entity_name();
$displayvalue = $conditioninstance->get_header();