mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2017-05-10 11:48:40 +08:00
commit 865e2bc7dc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/assign/gradingtable.php
View File

@ -209,14 +209,13 @@ class assign_grading_table extends table_sql implements renderable {
JOIN {groups_members} gm ON gm.groupid = g.id
WHERE go.assignid = :assignmentid6
)
) AS merged
) merged
GROUP BY merged.userid
) priority ON priority.userid = u.id
JOIN (
(SELECT 9999999 AS priority,
u.id AS userid,
a.allowsubmissionsfromdate,
a.duedate,
a.cutoffdate
@ -226,7 +225,6 @@ class assign_grading_table extends table_sql implements renderable {
UNION
(SELECT 0 AS priority,
uo.userid,
uo.allowsubmissionsfromdate,
uo.duedate,
uo.cutoffdate
@ -236,7 +234,6 @@ class assign_grading_table extends table_sql implements renderable {
UNION
(SELECT go.sortorder AS priority,
gm.userid,
go.allowsubmissionsfromdate,
go.duedate,
go.cutoffdate
@ -246,7 +243,7 @@ class assign_grading_table extends table_sql implements renderable {
WHERE go.assignid = :assignmentid9
)
) AS effective ON effective.priority = priority.priority AND effective.userid = priority.userid ';
) effective ON effective.priority = priority.priority AND effective.userid = priority.userid ';
}
if (!empty($this->assignment->get_instance()->blindmarking)) {