MDL-75285 core_reportbuilder: allow left joins on category entity

moodle · Jul 29, 2022 · 492bac1 · 492bac1
1 parent a866652
commit 492bac1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/course/classes/local/entities/course_category.php b/course/classes/local/entities/course_category.php
@@ -97,8 +97,9 @@ protected function get_all_columns(): array {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_TEXT)
             ->add_fields("{$tablealias}.name, {$tablealias}.id")
-            ->add_callback(static function(string $name, stdClass $category): string {
-                return core_course_category::get($category->id, MUST_EXIST, true)->get_formatted_name();
+            ->add_callback(static function(?string $name, stdClass $category): string {
+                return empty($category->id) ? '' :
+                    core_course_category::get($category->id, MUST_EXIST, true)->get_formatted_name();
             })
             ->set_is_sortable(true);
 
@@ -111,8 +112,9 @@ protected function get_all_columns(): array {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_TEXT)
             ->add_fields("{$tablealias}.name, {$tablealias}.id")
-            ->add_callback(static function(string $name, stdClass $category): string {
-                return core_course_category::get($category->id, MUST_EXIST, true)->get_nested_name(false);
+            ->add_callback(static function(?string $name, stdClass $category): string {
+                return empty($category->id) ? '' :
+                    core_course_category::get($category->id, MUST_EXIST, true)->get_nested_name(false);
             })
             ->set_disabled_aggregation(['groupconcat', 'groupconcatdistinct'])
             ->set_is_sortable(true);