MDL-69956 forum: throw exception when advanced grading is not ready

nilo72 · Apr 30, 2021 · 9e1dacc · 9e1dacc
1 parent a5f0b35
commit 9e1dacc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php b/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php
@@ -156,6 +156,9 @@ public static function get_fetch_data(gradeitem $gradeitem, stdClass $gradeduser
         $hasgrade = $gradeitem->user_has_grade($gradeduser);
         $grade = $gradeitem->get_grade_for_user($gradeduser, $USER);
         $instance = $gradeitem->get_advanced_grading_instance($USER, $grade);
+        if (!$instance) {
+            throw new moodle_exception('error:gradingunavailable', 'grading');
+        }
         $controller = $instance->get_controller();
         $definition = $controller->get_definition();
         $fillings = $instance->get_guide_filling();

diff --git a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
@@ -149,6 +149,10 @@ public static function get_fetch_data(gradeitem $gradeitem, stdClass $gradeduser
         $hasgrade = $gradeitem->user_has_grade($gradeduser);
         $grade = $gradeitem->get_grade_for_user($gradeduser, $USER);
         $instance = $gradeitem->get_advanced_grading_instance($USER, $grade);
+        if (!$instance) {
+            throw new moodle_exception('error:gradingunavailable', 'grading');
+        }
+
         $controller = $instance->get_controller();
         $definition = $controller->get_definition();
         $fillings = $instance->get_rubric_filling();

diff --git a/lang/en/grading.php b/lang/en/grading.php
@@ -95,3 +95,4 @@
 $string['templatetypeshared'] = 'Shared template';
 $string['templatesource'] = 'Location: {$a->component} ({$a->area})';
 $string['error:notinrange'] = 'Invalid grade \'{$a->grade}\' provided. Grades must be between 0 and {$a->maxgrade}.';
+$string['error:gradingunavailable'] = 'The advanced grading method is not correctly set. Please check the whole forum grading options in the forum settings.';