From 99467a9f7fe4116f7cf55b9e3dc98c3ecd3bf866 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 19 Jun 2012 23:48:39 +0800 Subject: [PATCH] MDL-33853: Prevent locking an assignment submission from putting a grade of 0 in the gradebook --- mod/assign/gradingtable.php | 2 +- mod/assign/locallib.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index 9e1c9ce7b1e..abd5b7212b1 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -373,7 +373,7 @@ class assign_grading_table extends table_sql implements renderable { function col_timemarked(stdClass $row) { $o = '-'; - if ($row->timemarked) { + if ($row->timemarked && $row->grade !== NULL && $row->grade >= 0) { $o = userdate($row->timemarked); } diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index df4e4a2c19e..28e88300e4d 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -2121,7 +2121,9 @@ class assign { // trying to match those array keys in grade update function in gradelib.php // with keys in th database table assign_grades // starting around line 262 - $gradebookgrade['rawgrade'] = $grade->grade; + if ($grade->grade >= 0) { + $gradebookgrade['rawgrade'] = $grade->grade; + } $gradebookgrade['userid'] = $grade->userid; $gradebookgrade['usermodified'] = $grade->grader; $gradebookgrade['datesubmitted'] = NULL; -- 2.43.0