From db2a65bfa9589f2212baef2320dd3c0dc6de2ebf Mon Sep 17 00:00:00 2001 From: Stephen Bourget Date: Mon, 21 Jan 2013 12:02:25 -0500 Subject: [PATCH] MDL-37533 Assign: Fix grading filters to show only assignments needing grading Conflicts: mod/assign/gradingtable.php --- mod/assign/gradingtable.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index 5e1789515ae..c724eed393c 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -105,7 +105,10 @@ class assign_grading_table extends table_sql implements renderable { $where .= ' AND s.timecreated > 0 '; } if ($filter == ASSIGN_FILTER_REQUIRE_GRADING) { - $where .= ' AND (s.timemodified > g.timemodified OR (s.timemodified IS NOT NULL AND g.timemodified IS NULL))'; + $where .= ' AND (s.timemodified IS NOT NULL AND + s.status = :submitted AND + (s.timemodified > g.timemodified OR g.timemodified IS NULL))'; + $params['submitted'] = ASSIGN_SUBMISSION_STATUS_SUBMITTED; } if (strpos($filter, ASSIGN_FILTER_SINGLE_USER) === 0) { $userfilter = (int) array_pop(explode('=', $filter));