mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 00:16:46 +02:00
Forgot to prepend country codes to the teacher list as well when sorting.
This commit is contained in:
parent
113130bd32
commit
94640580f3
1 changed files with 14 additions and 1 deletions
|
@ -194,6 +194,7 @@
|
||||||
print_user($teacher, $course);
|
print_user($teacher, $course);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
$countrysort = (strpos($sortclause, 'country') !== false);
|
||||||
foreach ($teachers as $teacher) {
|
foreach ($teachers as $teacher) {
|
||||||
|
|
||||||
if ($teacher->lastaccess) {
|
if ($teacher->lastaccess) {
|
||||||
|
@ -201,13 +202,25 @@
|
||||||
} else {
|
} else {
|
||||||
$lastaccess = $strnever;
|
$lastaccess = $strnever;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (empty($teacher->country)) {
|
||||||
|
$country = '';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if($countrysort) {
|
||||||
|
$country = '('.$teacher->country.') '.$countries[$teacher->country];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$country = $countries[$teacher->country];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$table->add_data(array (
|
$table->add_data(array (
|
||||||
//'<input type="checkbox" name="userid[]" value="'.$teacher->id.'" />',
|
//'<input type="checkbox" name="userid[]" value="'.$teacher->id.'" />',
|
||||||
print_user_picture($teacher->id, $course->id, $teacher->picture, false, true),
|
print_user_picture($teacher->id, $course->id, $teacher->picture, false, true),
|
||||||
'<strong><a href="'.$CFG->wwwroot.'/user/view.php?id='.$teacher->id.'&course='.$course->id.'">'.fullname($teacher, $isteacher).'</a></strong>',
|
'<strong><a href="'.$CFG->wwwroot.'/user/view.php?id='.$teacher->id.'&course='.$course->id.'">'.fullname($teacher, $isteacher).'</a></strong>',
|
||||||
$teacher->city,
|
$teacher->city,
|
||||||
$teacher->country ? $countries[$teacher->country] : '',
|
$country,
|
||||||
$lastaccess));
|
$lastaccess));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue