Merge branch 'MDL-73466' of https://github.com/paulholden/moodle

UniGe · Jun 10, 2022 · efb5c08 · efb5c08
2 parents 4a6966d + 3642b6d
commit efb5c08
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/mod/forum/report/summary/index.php b/mod/forum/report/summary/index.php
@@ -57,7 +57,7 @@
 foreach ($courseforums as $courseforumid => $courseforum) {
     if ($courseforum->uservisible) {
         $forumsvisibletouser[$courseforumid] = $courseforum;
-        $forumselectoptions[$courseforumid] = $courseforum->name;
+        $forumselectoptions[$courseforumid] = $courseforum->get_formatted_name();
     }
 }
 
@@ -67,7 +67,7 @@
     }
 
     $filters['forums'] = [$forumid];
-    $title = $forumsvisibletouser[$forumid]->name;
+    $title = $forumsvisibletouser[$forumid]->get_formatted_name();
     $forumcm = $forumsvisibletouser[$forumid];
     $cms[] = $forumcm;
 

diff --git a/mod/forum/report/summary/tests/behat/course_summary.feature b/mod/forum/report/summary/tests/behat/course_summary.feature
@@ -84,6 +84,18 @@ Feature: Course level forum summary report
       | First name / Surname |
       | Student 3            |
 
+  Scenario: Course forum summary report correctly formats forum activity names
+    Given the "multilang" filter is "on"
+    And the "multilang" filter applies to "content and headings"
+    And the following "activity" exists:
+      | activity | forum |
+      | course   | C1    |
+      | name     | <span class="multilang" lang="en">F-Eng</span><span class="multilang" lang="de">F-Ger</span> |
+    When I am on the "C1" "Course" page logged in as "teacher1"
+    And I follow "F-Eng"
+    And I navigate to "Reports" in current page administration
+    Then the "Forum selected" select box should contain "F-Eng"
+
   Scenario: Students given the view capability can view their own course report data
     Given the following "permission overrides" exist:
       | capability               | permission | role    | contextlevel | reference |