mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2016-01-19 08:35:23 +08:00
commit fe99a27859
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/assign/gradingtable.php
View File

@ -273,6 +273,14 @@ class assign_grading_table extends table_sql implements renderable {
$columns[] = 'fullname';
$headers[] = get_string('fullname');
// Participant # details if can view real identities.
if ($this->assignment->is_blind_marking()) {
if (!$this->is_downloading()) {
$columns[] = 'recordid';
$headers[] = get_string('recordid', 'assign');
}
}
foreach ($extrauserfields as $extrafield) {
$columns[] = $extrafield;
$headers[] = get_user_field_name($extrafield);

4
mod/assign/tests/locallib_test.php
View File

@ -2278,8 +2278,8 @@ Anchor link 2:<a title=\"bananas\" href=\"../logo-240x60.gif\">Link text</a>
$this->setUser($manager);
$gradingtable = new assign_grading_table($assign, 1, '', 0, true);
$output = $assign->get_renderer()->render($gradingtable);
$this->assertEquals(false, strpos($output, get_string('hiddenuser', 'assign')));
$this->assertEquals(true, strpos($output, fullname($student))); //students full name doesn't appear.
$this->assertEquals(true, strpos($output, get_string('hiddenuser', 'assign')));
$this->assertEquals(true, strpos($output, fullname($student)));
}
/**