mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sara Arjona 2023-03-22 13:50:06 +01:00
commit d04f42492c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
reportbuilder/classes/local/helpers/custom_fields.php
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}"
))