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).
This commit is contained in:
Tony Butler 2021-05-28 10:21:01 +01:00
parent 9533e8ddf5
commit ec0185ccc2
No known key found for this signature in database
GPG Key ID: 9711182AA2B802C4

View File

@ -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 {