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-42495-m' of git://github.com/micaherne/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2014-01-20 13:21:58 +08:00
commit ac97a7ed53
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mod/lesson/essay.php
View File

@ -266,23 +266,12 @@ switch ($mode) {
$ufields = user_picture::fields('u');
list($sort, $sortparams) = users_order_by_sql('u');
$params = array_merge($params, $sortparams);
if (!empty($cm->groupingid)) {
$params["groupingid"] = $cm->groupingid;
$sql = "SELECT DISTINCT $ufields
FROM {lesson_attempts} a
INNER JOIN {user} u ON u.id = a.userid
INNER JOIN {groups_members} gm ON gm.userid = u.id
INNER JOIN {groupings_groups} gg ON gm.groupid = gg.groupid AND gg.groupingid = :groupingid
WHERE a.lessonid = :lessonid
ORDER BY $sort";
} else {
$sql = "SELECT DISTINCT $ufields
FROM {user} u,
{lesson_attempts} a
WHERE a.lessonid = :lessonid and
u.id = a.userid
ORDER BY $sort";
}
$sql = "SELECT DISTINCT $ufields
FROM {user} u,
{lesson_attempts} a
WHERE a.lessonid = :lessonid and
u.id = a.userid
ORDER BY $sort";
if (!$users = $DB->get_records_sql($sql, $params)) {
$mode = 'none'; // not displaying anything
$lesson->add_message(get_string('noonehasanswered', 'lesson'));