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

Merge branch 'MDL-77692-401' of https://github.com/paulholden/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2023-03-22 13:50:11 +01:00
parent 0b973b52e9 fac1828222
commit 0d80eea9af
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reportbuilder/classes/local/helpers/custom_fields.php
+2 -3
View File
@@ -127,12 +127,11 @@ class custom_fields {
$selectfields .= ", {$customdatatablealias}.valueformat";
}
$columnname = $field->get_formatted_name();
$columntype = $this->get_column_type($field, $datafield);
$newcolumn = (new column(
'customfield_' . $field->get('shortname'),
new lang_string('customfieldcolumn', 'core_reportbuilder', $columnname),
new lang_string('customfieldcolumn', 'core_reportbuilder', $field->get_formatted_name()),
$this->entityname
))
->add_joins($this->get_joins())
@@ -207,7 +206,7 @@ class custom_fields {
$filter = (new filter(
$typeclass,
'customfield_' . $field->get('shortname'),
new lang_string('customfieldcolumn', 'core_reportbuilder', $field->get('name')),
new lang_string('customfieldcolumn', 'core_reportbuilder', $field->get_formatted_name()),
$this->entityname,
"{$customdatatablealias}.{$datafield}"
))