L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-85734-500' of https://github.com/lucaboesch/moodle into MOODLE_500_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2025-06-26 08:25:49 +07:00
parent 33a256386d ae930707d7
commit 89d4e6425f
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+2 -2
View File
@@ -3034,7 +3034,7 @@ function calendar_output_fragment_event_form($args) {
$groupcoursedata = groups_get_course_data($courseid);
$formoptions['groups'] = [];
foreach ($groupcoursedata->groups as $groupid => $groupdata) {
$formoptions['groups'][$groupid] = $groupdata->name;
$formoptions['groups'][$groupid] = format_string($groupdata->name, true, ['context' => $context]);
}
}
@@ -3078,7 +3078,7 @@ function calendar_output_fragment_event_form($args) {
$groupcoursedata = groups_get_course_data($event->courseid);
$formoptions['groups'] = [];
foreach ($groupcoursedata->groups as $groupid => $groupdata) {
$formoptions['groups'][$groupid] = $groupdata->name;
$formoptions['groups'][$groupid] = format_string($groupdata->name, true, ['context' => $context]);
}
}
calendar/tests/behat/calendar.feature
+34
View File
@@ -454,3 +454,37 @@ Feature: Perform basic calendar functionality
And I press "Save"
And I click on "type change test event" "link"
And I should see "Category event"
@javascript
Scenario: Group multilang tags are respected on event forms
Given the "multilang" filter is "on"
And the "multilang" filter applies to "content and headings"
And the following "courses" exist:
| fullname | shortname | format | category |
| Course 5 | C5 | topics | cata |
And the following "groups" exist:
| name | course | idnumber |
| <span lang="en" class="multilang">Group</span><span lang="es" class="multilang">Grupo</span> 2 | C5 | G2 |
And the following "blocks" exist:
| blockname | contextlevel | reference | pagetypepattern | defaultregion |
| calendar_month | Course | C5 | course-view-* | side-pre |
And I am on the "Course 5" course page logged in as admin
And I follow "Course calendar"
# New event form.
And I press "New event"
When I set the following fields to these values:
| Event title | Group 2 event |
| Type of event | Group |
Then I should see "Group 2"
And I should not see "GroupGrupo 2"
And I press "Save"
And I am on "Course 5" course homepage
And I follow "Course calendar"
# Preview event modal.
And I click on "Group 2 event" "link"
And I should see "Group 2"
And I should not see "GroupGrupo 2"
# Edit event form.
And I press "Edit"
And I should see "Group 2"
And I should not see "GroupGrupo 2"