MDL-50729 gradelib: Regrade event should be assigned to system

rboyatt · Feb 14, 2017 · cb9abde · cb9abde
1 parent 0edba58
commit cb9abde
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/lib/classes/event/user_graded.php b/lib/classes/event/user_graded.php
@@ -53,18 +53,24 @@ class user_graded extends base {
      * Utility method to create new event.
      *
      * @param \grade_grade $grade
+     * @param null|int $userid Id of user responsible for this event.
+     *
      * @return user_graded
      */
-    public static function create_from_grade(\grade_grade $grade) {
-        $event = self::create(array(
+    public static function create_from_grade(\grade_grade $grade, $userid = null) {
+        $gradedata = array(
             'context'       => \context_course::instance($grade->grade_item->courseid),
             'objectid'      => $grade->id,
             'relateduserid' => $grade->userid,
             'other'         => array(
                 'itemid'     => $grade->itemid,
                 'overridden' => !empty($grade->overridden),
                 'finalgrade' => $grade->finalgrade),
-        ));
+        );
+        if ($userid !== null) {
+            $gradedata["userid"] = $userid;
+        }
+        $event = self::create($gradedata);
         $event->grade = $grade;
         return $event;
     }

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
@@ -658,7 +658,7 @@ private function aggregate_grades($userid,
 
                 // If successful trigger a user_graded event.
                 if ($success) {
-                    \core\event\user_graded::create_from_grade($grade)->trigger();
+                    \core\event\user_graded::create_from_grade($grade, \core\event\base::USER_OTHER)->trigger();
                 }
             }
             $dropped = $grade_values;
@@ -743,7 +743,7 @@ private function aggregate_grades($userid,
 
                 // If successful trigger a user_graded event.
                 if ($success) {
-                    \core\event\user_graded::create_from_grade($grade)->trigger();
+                    \core\event\user_graded::create_from_grade($grade, \core\event\base::USER_OTHER)->trigger();
                 }
             }
             $this->set_usedinaggregation($userid, $usedweights, $novalue, $dropped, $extracredit);
@@ -786,7 +786,7 @@ private function aggregate_grades($userid,
 
             // If successful trigger a user_graded event.
             if ($success) {
-                \core\event\user_graded::create_from_grade($grade)->trigger();
+                \core\event\user_graded::create_from_grade($grade, \core\event\base::USER_OTHER)->trigger();
             }
         }
 

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
@@ -775,7 +775,7 @@ public function regrade_final_grades($userid=null) {
                     // If successful trigger a user_graded event.
                     if ($success) {
                         $grade->load_grade_item();
-                        \core\event\user_graded::create_from_grade($grade)->trigger();
+                        \core\event\user_graded::create_from_grade($grade, \core\event\base::USER_OTHER)->trigger();
                     } else {
                         $result = "Internal error updating final grade";
                     }