From ec0185ccc246a1a1dd59ea6a8e5cb7fdc21d961c Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Fri, 28 May 2021 10:21:01 +0100 Subject: [PATCH] MDL-71694 assignfeedback_comments: Fill latest submitted comment data Otherwise if grading validation fails, any new/updated comments are lost and replaced with previously saved data (or an empty editor). --- mod/assign/feedback/comments/locallib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mod/assign/feedback/comments/locallib.php b/mod/assign/feedback/comments/locallib.php index 07c83bc28f8..6bd4466e2ce 100644 --- a/mod/assign/feedback/comments/locallib.php +++ b/mod/assign/feedback/comments/locallib.php @@ -348,7 +348,11 @@ class assign_feedback_comments extends assign_feedback_plugin { $feedbackcomments = $this->get_feedback_comments($grade->id); } - if ($feedbackcomments && !empty($feedbackcomments->commenttext)) { + // Check first for data from last form submission in case grading validation failed. + if (!empty($data->assignfeedbackcomments_editor['text'])) { + $data->assignfeedbackcomments = $data->assignfeedbackcomments_editor['text']; + $data->assignfeedbackcommentsformat = $data->assignfeedbackcomments_editor['format']; + } else if ($feedbackcomments && !empty($feedbackcomments->commenttext)) { $data->assignfeedbackcomments = $feedbackcomments->commenttext; $data->assignfeedbackcommentsformat = $feedbackcomments->commentformat; } else {