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

MDL-74342 reportbuilder: remove unnecessary template/dataset values.

Browse Source
This commit is contained in:
Paul Holden
2022-03-29 09:46:55 +01:00
parent a896ea6473
commit dcda9c08e2
7 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reportbuilder/classes/form/audience.php
+14 -9
View File
@@ -131,7 +131,7 @@ class audience extends dynamic_form {
$audience = $audience::create($formdata->reportid, $configdata);
} else {
// Editing audience.
$audience->update_configdata($configdata, true);
$audience->update_configdata($configdata);
}
$persistent = $audience->get_persistent();
@@ -149,17 +149,22 @@ class audience extends dynamic_form {
*/
public function set_data_for_dynamic_submission(): void {
$audience = $this->get_audience();
if ($audience->get_persistent()->get('id') !== 0) {
// Populate form with exisiting data.
$persistent = $audience->get_persistent();
// Populate form data based on whether we are editing/creating an audience.
if ($persistent->get('id') !== 0) {
$formdata = [
'id' => $audience->get_persistent()->get('id'),
'reportid' => $audience->get_persistent()->get('reportid'),
];
$formdata += $audience->get_configdata();
'id' => $persistent->get('id'),
'reportid' => $persistent->get('reportid'),
'classname' => $persistent->get('classname'),
] + $audience->get_configdata();
} else {
$formdata['reportid'] = $this->optional_param('reportid', null, PARAM_INT);
$formdata = [
'reportid' => $this->optional_param('reportid', null, PARAM_INT),
'classname' => $this->optional_param('classname', null, PARAM_RAW_TRIMMED),
];
}
$formdata['classname'] = $this->optional_param('classname', null, PARAM_RAW_TRIMMED);
$this->set_data($formdata);
}
reportbuilder/classes/output/dynamictabs/audience.php
-1
View File
@@ -111,7 +111,6 @@ class audience extends base {
$editable = new audience_heading_editable($persistent->get('id'));
$params = [
'identifier' => $persistent->get('classname'),
'instanceid' => $persistent->get('id'),
'description' => $reportaudience->get_description(),
'heading' => $reportaudience->get_name(),