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

Merge branch 'MDL-43037_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2013-11-26 08:36:09 +13:00
parent fdbd1d7a9d 295b622b0b
commit 390896d3d9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/override_form.php
+2 -2
View File
@@ -141,13 +141,13 @@ class quiz_override_form extends moodleform {
$groups = groups_get_all_groups($cm->course, 0, $cm->groupingid);
if (!empty($groups)) {
$users = get_users_by_capability($this->context, 'mod/quiz:attempt',
'u.id, u.firstname, u.lastname, u.email',
'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
$sort, '', '', array_keys($groups),
'', false, true);
}
} else {
$users = get_users_by_capability($this->context, 'mod/quiz:attempt',
'u.id, u.firstname, u.lastname, u.email' ,
'u.id, u.email, ' . get_all_user_name_fields(true, 'u'),
$sort, '', '', '', '', false, true);
}
if (empty($users)) {
mod/quiz/overrides.php
+5 -5
View File
@@ -99,11 +99,11 @@ if ($groupmode) {
} else {
$colname = get_string('user');
list($sort, $params) = users_order_by_sql('u');
$sql = 'SELECT o.*, u.firstname, u.lastname
FROM {quiz_overrides} o
JOIN {user} u ON o.userid = u.id
WHERE o.quiz = :quizid
ORDER BY ' . $sort;
$sql = 'SELECT o.*, ' . get_all_user_name_fields(true, 'u') . '
FROM {quiz_overrides} o
JOIN {user} u ON o.userid = u.id
WHERE o.quiz = :quizid
ORDER BY ' . $sort;
$params['quizid'] = $quiz->id;
}