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

Merge branch 'MDL-46322' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2017-06-14 12:32:01 +01:00
parent 63aa8c27be 84e3c97bb0
commit f1ec088e84
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+1 -1
View File
@@ -646,7 +646,7 @@ class assign_grading_table extends table_sql implements renderable {
static $markers = null;
static $markerlist = array();
if ($markers === null) {
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->assignment->get_context(), 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist[0] = get_string('choosemarker', 'assign');
mod/assign/locallib.php
+5 -5
View File
@@ -4017,7 +4017,7 @@ class assign {
// Get markers to use in drop lists.
$markingallocationoptions = array();
if ($markingallocation) {
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->context, 'mod/assign:grade', 0, 'u.*', $sort);
$markingallocationoptions[''] = get_string('filternone', 'assign');
@@ -4645,7 +4645,7 @@ class assign {
'usershtml' => $usershtml,
);
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->get_context(), 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist = array();
@@ -6534,7 +6534,7 @@ class assign {
if ($markingallocation) {
$markingallocationoptions[''] = get_string('filternone', 'assign');
$markingallocationoptions[ASSIGN_MARKER_FILTER_NO_MARKER] = get_string('markerfilternomarker', 'assign');
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->context, 'mod/assign:grade', 0, 'u.*', $sort);
foreach ($markers as $marker) {
@@ -7170,7 +7170,7 @@ class assign {
$this->get_instance()->markingallocation &&
has_capability('mod/assign:manageallocations', $this->context)) {
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->context, 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist = array('' => get_string('choosemarker', 'assign'));
@@ -7591,7 +7591,7 @@ class assign {
'usershtml' => '' // initialise these parameters with real information.
);
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Only enrolled users could be assigned as potential markers.
$markers = get_enrolled_users($this->get_context(), 'mod/assign:grade', 0, 'u.*', $sort);
$markerlist = array();
mod/assign/tests/markerallocation_test.php
+1 -1
View File
@@ -119,7 +119,7 @@ class mod_assign_markerallocation_testcase extends advanced_testcase {
$oldusers = array($user1, $user2, $user4);
$newusers = array($user1, $user2);
list($sort, $params) = users_order_by_sql();
list($sort, $params) = users_order_by_sql('u');
// Old code, it must return 3 users: teacher1, teacher2 and Manger.
$oldmarkers = get_users_by_capability(context_course::instance($this->course->id), 'mod/assign:grade', '', $sort);