mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 20:50:21 +01:00
Merge branch 'MDL-73466' of https://github.com/paulholden/moodle
This commit is contained in:
commit
efb5c089c6
@ -57,7 +57,7 @@ $forumselectoptions = [0 => get_string('forumselectcourseoption', 'forumreport_s
|
||||
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 @@ if ($forumid) {
|
||||
}
|
||||
|
||||
$filters['forums'] = [$forumid];
|
||||
$title = $forumsvisibletouser[$forumid]->name;
|
||||
$title = $forumsvisibletouser[$forumid]->get_formatted_name();
|
||||
$forumcm = $forumsvisibletouser[$forumid];
|
||||
$cms[] = $forumcm;
|
||||
|
||||
|
@ -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 |
|
||||
|
Loading…
x
Reference in New Issue
Block a user