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

NOMDL assignment recent activity: fixed missing properties needed for user avatar

Browse Source
This commit is contained in:
David Mudrak
2010-07-26 21:58:21 +00:00
parent 6f7b89e212
commit bf1da11afd
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assignment/lib.php
+13 -5
View File
@@ -2908,8 +2908,10 @@ function assignment_get_recent_mod_activity(&$activities, &$index, $timestart, $
$params['cminstance'] = $cm->instance;
$params['timestart'] = $timestart;
if (!$submissions = $DB->get_records_sql("SELECT asb.id, asb.timemodified, asb.userid,
u.firstname, u.lastname, u.email, u.picture
$userfields = user_picture::fields('u', null, 'userid');
if (!$submissions = $DB->get_records_sql("SELECT asb.id, asb.timemodified,
$userfields
FROM {assignment_submissions} asb
JOIN {assignment} a ON a.id = asb.assignment
JOIN {user} u ON u.id = asb.userid
@@ -2994,9 +2996,15 @@ function assignment_get_recent_mod_activity(&$activities, &$index, $timestart, $
$tmpactivity->grade = $grades->items[0]->grades[$submission->userid]->str_long_grade;
}
$tmpactivity->user->userid = $submission->userid;
$userfields = explode(',', user_picture::fields());
foreach ($userfields as $userfield) {
if ($userfield == 'id') {
$tmpactivity->user->{$userfield} = $submission->userid; // aliased in SQL above
} else {
$tmpactivity->user->{$userfield} = $submission->{$userfield};
}
}
$tmpactivity->user->fullname = fullname($submission, $viewfullnames);
$tmpactivity->user->picture = $submission->picture;
$activities[$index++] = $tmpactivity;
}
@@ -3035,7 +3043,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo
}
echo '<div class="user">';
echo "<a href=\"$CFG->wwwroot/user/view.php?id={$activity->user->userid}&amp;course=$courseid\">"
echo "<a href=\"$CFG->wwwroot/user/view.php?id={$activity->user->id}&amp;course=$courseid\">"
."{$activity->user->fullname}</a> - ".userdate($activity->timestamp);
echo '</div>';