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

Merged from MOODLE_15_STABLE: Fixing up a bug in the log selector to do with optionally showing all users in the dropdown when over COURSE_MAX_USERS_PER_DROPDOWN

Browse Source
This commit is contained in:
mjollnir_
2005-09-04 21:07:36 +00:00
parent d7aba64b5a
commit 3509dd97f0
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/lib.php
+12 -27
View File
@@ -242,25 +242,6 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
$showcourses = 1;
}
if ($course->category) {
if ($selectedgroup) { // If using a group, only get users in that group.
$courseusers = get_group_users($selectedgroup, 'u.lastname ASC', '', 'u.id');
} else {
$courseusers = get_course_users($course->id, '', '', 'u.id');
}
} else {
$courseusers = get_site_users('u.lastaccess DESC', 'u.id');
}
$numusers = count((array)$courseusers);
if ($numusers < COURSE_MAX_USERS_PER_DROPDOWN && !$showusers) {
$showusers = 1;
}
/// Setup for group handling.
$isteacher = isteacher($course->id);
$isteacheredit = isteacheredit($course->id);
@@ -280,17 +261,21 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
// Get all the possible users
$users = array();
if ($showusers) {
if ($course->category) {
if ($selectedgroup) { // If using a group, only get users in that group.
$courseusers = get_group_users($selectedgroup, 'u.lastname ASC', '', 'u.id, u.firstname, u.lastname');
} else {
$courseusers = get_course_users($course->id, '', '', 'u.id, u.firstname, u.lastname');
}
if ($course->category) {
if ($selectedgroup) { // If using a group, only get users in that group.
$courseusers = get_group_users($selectedgroup, 'u.lastname ASC', '', 'u.id, u.firstname, u.lastname, u.nickname, u.idnumber');
} else {
$courseusers = get_site_users("u.lastaccess DESC", "u.id, u.firstname, u.lastname");
$courseusers = get_course_users($course->id, '', '', 'u.id, u.firstname, u.lastname, u.nickname, u.idnumber');
}
} else {
$courseusers = get_site_users("u.lastaccess DESC", "u.id, u.firstname, u.lastname, u.nickname, u.idnumber");
}
if (count($courseusers) < COURSE_MAX_USERS_PER_DROPDOWN && !$showusers) {
$showusers = 1;
}
if ($showusers) {
if ($courseusers) {
foreach ($courseusers as $courseuser) {
$users[$courseuser->id] = fullname($courseuser, $isteacher);