MDL-80329 reportbuilder: trim whitespace in text filter content.

This commit is contained in:
Paul Holden
2023-12-13 10:15:32 +00:00
parent bffb5524a6
commit e56e9cd6de
4 changed files with 13 additions and 10 deletions
@@ -53,7 +53,7 @@ class courserole extends base {
// Course.
$elements['course'] = $mform->createElement('text', "{$this->name}_course", get_string('shortnamecourse'));
$mform->setType("{$this->name}_course", PARAM_RAW);
$mform->setType("{$this->name}_course", PARAM_RAW_TRIMMED);
$mform->addElement('group', "{$this->name}_group", '', $elements, '', false);
}
@@ -85,7 +85,7 @@ class courserole extends base {
}
// Course.
$course = $values["{$this->name}_course"] ?? '';
$course = trim($values["{$this->name}_course"] ?? '');
if ($course !== '') {
$selects[] = "{$coursealias}.shortname = :{$courseparam}";
$params[$courseparam] = $course;
@@ -47,6 +47,7 @@ class courserole_test extends advanced_testcase {
'Filter by category' => ['', 'cat2', '', ['user1', 'user2', 'user3']],
'Filter by category and course' => ['', 'cat2', 'course2', ['user1', 'user2']],
'Filter by course' => ['', '', 'course3', ['user3']],
'Filter by course (ensure whitespace is trimmed)' => ['', '', ' course3 ', ['user3']],
];
}