MDL-67548 core_course: Reflect content move category in deleted event.

moodle · May 11, 2020 · 27b29b2 · 27b29b2
1 parent 39e777e
commit 27b29b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/course/classes/category.php b/course/classes/category.php
@@ -2169,7 +2169,7 @@ public function delete_move($newparentid, $showfeedback = false) {
         $event = \core\event\course_category_deleted::create(array(
             'objectid' => $this->id,
             'context' => $context,
-            'other' => array('name' => $this->name)
+            'other' => array('name' => $this->name, 'contentmovedcategoryid' => $newparentid)
         ));
         $event->set_coursecat($this);
         $event->trigger();

diff --git a/lib/classes/event/course_category_deleted.php b/lib/classes/event/course_category_deleted.php
@@ -33,6 +33,7 @@
  *      Extra information about event.
  *
  *      - string name: category name.
+ *      - string contentmovedcategoryid: (optional) category id where content was moved on deletion
  * }
  *
  * @package    core
@@ -71,7 +72,11 @@ public static function get_name() {
      * @return string
      */
     public function get_description() {
-        return "The user with id '$this->userid' deleted the course category with id '$this->objectid'.";
+        $descr = "The user with id '$this->userid' deleted the course category with id '$this->objectid'.";
+        if (!empty($this->other['contentmovedcategoryid'])) {
+            $descr .= " Its content has been moved to category with id '{$this->other['contentmovedcategoryid']}'.";
+        }
+        return $descr;
     }
 
     /**