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

MDL-42670 mod_assign: Fix recent activity block when blind marking is on

Browse Source
This commit is contained in:
Tim Lock
2015-09-07 22:45:15 +02:00
committed by Eloy Lafuente (stronk7)
parent dff6cdc883
commit acefd2e24f
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/lib.php
+7
View File
@@ -613,7 +613,14 @@ function assign_print_recent_activity($course, $viewfullnames, $timestart) {
foreach ($show as $submission) {
$cm = $modinfo->get_cm($submission->cmid);
$context = context_module::instance($submission->cmid);
$assign = new assign($context, $cm, $cm->course);
$link = $CFG->wwwroot.'/mod/assign/view.php?id='.$cm->id;
// Obscure first and last name if blind marking enabled.
if ($assign->is_blind_marking()) {
$submission->firstname = get_string('participant', 'mod_assign');
$submission->lastname = $assign->get_uniqueid_for_user($submission->userid);
}
print_recent_activity_note($submission->timemodified,
$submission,
$cm->name,
mod/assign/tests/lib_test.php
+24
View File
@@ -145,6 +145,30 @@ class mod_assign_lib_testcase extends mod_assign_base_testcase {
assign_print_recent_activity($this->course, false, time() - 3600);
}
/** Make sure blind marking shows participant \d+ not fullname when assign_print_recent_activity is triggered. */
public function test_print_recent_activity_fullname_blind_marking() {
// Submitting an assignment generates a notification in blind marking.
$this->preventResetByRollback();
$sink = $this->redirectMessages();
$this->setUser($this->editingteachers[0]);
$assign = $this->create_instance(array('blindmarking' => 1));
$data = new stdClass();
$data->userid = $this->students[0]->id;
$notices = array();
$this->setUser($this->students[0]);
$assign->submit_for_grading($data, $notices);
$this->setUser($this->editingteachers[0]);
$uniqueid = $assign->get_uniqueid_for_user($data->userid);
$expectedstr = preg_quote(get_string('participant', 'mod_assign'), '/') . '.*' . $uniqueid;
$this->expectOutputRegex("/{$expectedstr}/");
assign_print_recent_activity($this->course, false, time() - 3600);
$sink->close();
}
public function test_assign_get_recent_mod_activity() {
$this->setUser($this->editingteachers[0]);
$assign = $this->create_instance();