MDL-66360 grade: fix user grade notification sending errors

moodle · Nov 11, 2019 · 175fd68 · 175fd68
1 parent c67a54e
commit 175fd68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/grade/classes/component_gradeitem.php b/grade/classes/component_gradeitem.php
@@ -491,23 +491,18 @@ public function get_advanced_grading_instance(stdClass $grader, stdClass $grade,
      * @param stdClass $grader The user who is grading
      */
     public function send_student_notification(stdClass $gradeduser, stdClass $grader): void {
-        list($itemtype, $itemmodule) = \core_component::normalize_component($this->component);
-        $gradeitem = \grade_item::fetch([
-            'itemtype' => $itemtype,
-            'itemmodule' => $itemmodule,
-            'iteminstance' => $this->itemnumber,
-        ]);
-
+        $contextname = $this->context->get_context_name();
         $eventdata = new \core\message\message();
         $eventdata->courseid          = $this->context->get_course_context()->instanceid;
         $eventdata->component         = 'moodle';
         $eventdata->name              = 'gradenotifications';
         $eventdata->userfrom          = $grader;
         $eventdata->userto            = $gradeduser;
         $eventdata->subject           = get_string('gradenotificationsubject', 'grades');
-        $eventdata->fullmessage       = get_string('gradenotificationmessage', 'grades', ['name' => $gradeitem->get_name()]);
-
-        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessage       = get_string('gradenotificationmessage', 'grades', $contextname);
+        $eventdata->contexturl        = $this->context->get_url();
+        $eventdata->contexturlname    = $contextname;
+        $eventdata->fullmessageformat = FORMAT_HTML;
         $eventdata->fullmessagehtml   = '';
         $eventdata->smallmessage      = '';
         $eventdata->notification      = 1;

diff --git a/lang/en/grades.php b/lang/en/grades.php
@@ -318,7 +318,7 @@
 $string['grademax_help'] = 'This setting determines the maximum grade when using the value grade type. The maximum grade for an activity-based grade item is set on the activity settings page.';
 $string['grademin'] = 'Minimum grade';
 $string['grademin_help'] = 'This setting determines the minimum grade when using the value grade type.';
-$string['gradenotificationmessage'] = 'You have new feedback on your work for "{$a->name}"';
+$string['gradenotificationmessage'] = 'You have new feedback on your work for "{$a}"';
 $string['gradenotificationsubject'] = 'Your have been graded';
 $string['gradeoutcomeitem'] = 'Grade outcome item';
 $string['gradeoutcomes'] = 'Outcomes';