moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-49933 mod_assign: Sort marker select lists alphabetically by name

Browse source
This commit is contained in:
Tony Butler 2015-04-20 12:24:04 +01:00
parent d302ba231f
commit 2224f2c598
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/assign/gradingtable.php
View file

@ -541,7 +541,8 @@ class assign_grading_table extends table_sql implements renderable {
static $markers = null;
static $markerlist = array();
if ($markers === null) {
$markers = get_users_by_capability($this->assignment->get_context(), 'mod/assign:grade');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->assignment->get_context(), 'mod/assign:grade', '', $sort);
$markerlist[0] = get_string('choosemarker', 'assign');
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);

15
mod/assign/locallib.php
View file

@ -3251,7 +3251,8 @@ class assign {
// Get markers to use in drop lists.
$markingallocationoptions = array();
if ($markingallocation) {
$markers = get_users_by_capability($this->context, 'mod/assign:grade');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
$markingallocationoptions[''] = get_string('filternone', 'assign');
$markingallocationoptions[ASSIGN_MARKER_FILTER_NO_MARKER] = get_string('markerfilternomarker', 'assign');
foreach ($markers as $marker) {
@ -3792,7 +3793,8 @@ class assign {
'usershtml' => $usershtml,
);
$markers = get_users_by_capability($this->get_context(), 'mod/assign:grade');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->get_context(), 'mod/assign:grade', '', $sort);
$markerlist = array();
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);
@ -5555,7 +5557,8 @@ class assign {
if ($markingallocation) {
$markingallocationoptions[''] = get_string('filternone', 'assign');
$markingallocationoptions[ASSIGN_MARKER_FILTER_NO_MARKER] = get_string('markerfilternomarker', 'assign');
$markers = get_users_by_capability($this->context, 'mod/assign:grade');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
foreach ($markers as $marker) {
$markingallocationoptions[$marker->id] = fullname($marker);
}
@ -6132,7 +6135,8 @@ class assign {
$this->get_instance()->markingallocation &&
has_capability('mod/assign:manageallocations', $this->context)) {
$markers = get_users_by_capability($this->context, 'mod/assign:grade');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->context, 'mod/assign:grade', '', $sort);
$markerlist = array('' => get_string('choosemarker', 'assign'));
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);
@ -6536,7 +6540,8 @@ class assign {
'usershtml' => '' // initialise these parameters with real information.
);
$markers = get_users_by_capability($this->get_context(), 'mod/assign:grade');
list($sort, $params) = users_order_by_sql();
$markers = get_users_by_capability($this->get_context(), 'mod/assign:grade', '', $sort);
$markerlist = array();
foreach ($markers as $marker) {
$markerlist[$marker->id] = fullname($marker);