mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jake Dallimore 2019-10-14 15:33:10 +08:00
commit 050f048e26
2 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tablelib.php
View File

@ -863,9 +863,9 @@ class flexible_table {
* @return string contents of cell in column 'fullname', for this row.
*/
function col_fullname($row) {
global $COURSE;
global $PAGE, $COURSE;
$name = fullname($row);
$name = fullname($row, has_capability('moodle/site:viewfullnames', $PAGE->context));
if ($this->download) {
return $name;
}

63
lib/tests/tablelib_test.php
View File

@ -37,7 +37,7 @@ require_once($CFG->libdir . '/tests/fixtures/testable_flexible_table.php');
* @copyright 2013 Damyon Wiese <damyon@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_tablelib_testcase extends basic_testcase {
class core_tablelib_testcase extends advanced_testcase {
protected function generate_columns($cols) {
$columns = array();
foreach (range(0, $cols - 1) as $j) {
@ -352,6 +352,67 @@ class core_tablelib_testcase extends basic_testcase {
);
}
/**
* Data provider for test_fullname_column
*
* @return array
*/
public function fullname_column_provider() {
return [
['language'],
['alternatename lastname'],
['firstname lastnamephonetic'],
];
}
/**
* Test fullname column observes configured alternate fullname format configuration
*
* @param string $format
* @return void
*
* @dataProvider fullname_column_provider
*/
public function test_fullname_column(string $format) {
$this->resetAfterTest();
$this->setAdminUser();
set_config('alternativefullnameformat', $format);
$user = $this->getDataGenerator()->create_user();
$table = $this->create_and_setup_table(['fullname'], [], true, false, [], []);
$this->assertContains(fullname($user, true), $table->format_row($user)['fullname']);
}
/**
* Test fullname column ignores fullname format configuration for a user with viewfullnames capability prohibited
*
* @param string $format
* @return void
*
* @dataProvider fullname_column_provider
*/
public function test_fullname_column_prohibit_viewfullnames(string $format) {
global $DB, $CFG;
$this->resetAfterTest();
set_config('alternativefullnameformat', $format);
$currentuser = $this->getDataGenerator()->create_user();
$this->setUser($currentuser);
// Prohibit the viewfullnames from the default user role.
$userrole = $DB->get_record('role', ['id' => $CFG->defaultuserroleid]);
role_change_permission($userrole->id, context_system::instance(), 'moodle/site:viewfullnames', CAP_PROHIBIT);
$user = $this->getDataGenerator()->create_user();
$table = $this->create_and_setup_table(['fullname'], [], true, false, [], []);
$this->assertContains(fullname($user, false), $table->format_row($user)['fullname']);
}
public function test_get_row_html() {
$data = $this->generate_data(1, 5);
$columns = $this->generate_columns(5);