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

Merge branch 'MDL-84129-404' of https://github.com/paulholden/moodle into MOODLE_404_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2025-01-29 08:50:14 +01:00
parent ef550e346a 3b5b747bf0
commit 5dc97f0d3b
2 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reportbuilder/classes/local/entities/user.php
+8 -7
View File
@@ -202,10 +202,11 @@ class user extends base {
))
->add_joins($this->get_joins())
->add_fields($fullnameselect)
->set_type(column::TYPE_TEXT)
->set_is_sortable($this->is_sortable('fullname'), $fullnamesort)
->add_callback(static function(?string $value, stdClass $row) use ($viewfullnames): string {
if ($value === null) {
->add_callback(static function($value, stdClass $row) use ($viewfullnames): string {
// Ensure we have at least one field present.
if (count(array_filter((array) $row, fn($field) => $field !== null)) === 0) {
return '';
}
@@ -233,12 +234,12 @@ class user extends base {
->add_joins($this->get_joins())
->add_fields($fullnameselect)
->add_field("{$usertablealias}.id")
->set_type(column::TYPE_TEXT)
->set_is_sortable($this->is_sortable($fullnamefield), $fullnamesort)
->add_callback(static function(?string $value, stdClass $row) use ($fullnamefield, $viewfullnames): string {
->add_callback(static function($value, stdClass $row) use ($fullnamefield, $viewfullnames): string {
global $OUTPUT;
if ($value === null) {
// Ensure we have at least one field present.
if (count(array_filter((array) $row, fn($field) => $field !== null)) === 0) {
return '';
}
@@ -262,7 +263,7 @@ class user extends base {
fullname($row, $viewfullnames));
}
return $value;
return (string) $value;
});
// Picture fields need some more data.
user/tests/reportbuilder/datasource/users_test.php
+50
View File
@@ -201,6 +201,56 @@ final class users_test extends core_reportbuilder_testcase {
$this->assertEquals($cohort->name, $cohortname);
}
/**
* Test fullname columns when alternative fullname format is configured
*/
public function test_datasource_alternative_fullname_columns(): void {
$this->resetAfterTest();
$this->setAdminUser();
set_config('alternativefullnameformat', '(alternatename) firstname lastname');
$this->getDataGenerator()->create_user(['firstname' => 'John', 'lastname' => 'Smith', 'alternatename' => 'JS']);
/** @var core_reportbuilder_generator $generator */
$generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
$report = $generator->create_report(['name' => 'Users', 'source' => users::class, 'default' => 0]);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:fullname', 'sortenabled' => 1]);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:fullnamewithlink']);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:fullnamewithpicture']);
$generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:fullnamewithpicturelink']);
$content = $this->get_custom_report_content($report->get('id'));
$this->assertCount(2, $content);
// Admin row.
[
$fullname,
$fullnamewithlink,
$fullnamewithpicture,
$fullnamewithpicturelink
] = array_values($content[0]);
$this->assertEquals('Admin User', $fullname);
$this->assertStringContainsString('Admin User', $fullnamewithlink);
$this->assertStringContainsString('Admin User', $fullnamewithpicture);
$this->assertStringContainsString('Admin User', $fullnamewithpicturelink);
// User row.
[
$fullname,
$fullnamewithlink,
$fullnamewithpicture,
$fullnamewithpicturelink
] = array_values($content[1]);
$this->assertEquals('(JS) John Smith', $fullname);
$this->assertStringContainsString('(JS) John Smith', $fullnamewithlink);
$this->assertStringContainsString('(JS) John Smith', $fullnamewithpicture);
$this->assertStringContainsString('(JS) John Smith', $fullnamewithpicturelink);
}
/**
* Data provider for {@see test_datasource_filters}
*