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

MDL-54873 assign: Seed recordid to print_recent_activity

Browse Source
This commit is contained in:
Andrew Nicols
2016-08-30 11:16:18 +08:00
parent cb55cd8574
commit ebd8ffb4e1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/lib.php
+6 -2
View File
@@ -649,13 +649,14 @@ function assign_print_recent_activity($course, $viewfullnames, $timestart) {
$dbparams = array($timestart, $course->id, 'assign', ASSIGN_SUBMISSION_STATUS_SUBMITTED);
$namefields = user_picture::fields('u', null, 'userid');
if (!$submissions = $DB->get_records_sql("SELECT asb.id, asb.timemodified, cm.id AS cmid,
if (!$submissions = $DB->get_records_sql("SELECT asb.id, asb.timemodified, cm.id AS cmid, um.id as recordid,
$namefields
FROM {assign_submission} asb
JOIN {assign} a ON a.id = asb.assignment
JOIN {course_modules} cm ON cm.instance = a.id
JOIN {modules} md ON md.id = cm.module
JOIN {user} u ON u.id = asb.userid
LEFT JOIN {assign_user_mapping} um ON um.userid = u.id AND um.assignment = a.id
WHERE asb.timemodified > ? AND
asb.latest = 1 AND
a.course = ? AND
@@ -735,7 +736,10 @@ function assign_print_recent_activity($course, $viewfullnames, $timestart) {
// 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);
if (empty($submission->recordid)) {
$submission->recordid = $assign->get_uniqueid_for_user($submission->userid);
}
$submission->lastname = $submission->recordid;
}
print_recent_activity_note($submission->timemodified,
$submission,