mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-76781-401' of https://github.com/lucaboesch/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Paul Holden 2023-01-06 10:23:55 +00:00
commit 13a6018b6d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grade/classes/external/get_groups_for_search_widget.php vendored
View File

@ -110,14 +110,14 @@ class get_groups_for_search_widget extends external_api {
]);
}
$mappedgroups = array_map(function($group) use ($COURSE, $actionbaseurl) {
$mappedgroups = array_map(function($group) use ($COURSE, $actionbaseurl, $context) {
$url = new \moodle_url($actionbaseurl, [
'id' => $COURSE->id,
'group' => $group->id
]);
return (object) [
'id' => $group->id,
'name' => $group->name,
'name' => format_string($group->name, true, ['context' => $context]),
'url' => $url->out(false),
'active' => false // @TODO MDL-76246
];

2
grade/renderer.php
View File

@ -76,7 +76,7 @@ class core_grades_renderer extends plugin_renderer_base {
if ($activegroup) {
$group = groups_get_group($activegroup);
$data['selectedgroup'] = $group->name;
$data['selectedgroup'] = format_string($group->name, true, ['context' => $context]);
} else if ($activegroup === 0) {
$data['selectedgroup'] = get_string('allparticipants');
}

8
grade/report/user/tests/behat/groupsearch.feature
View File

@ -17,12 +17,14 @@ Feature: Group searching functionality within the user report.
| student2 | C1 | student |
And the following "groups" exist:
| name | course | idnumber |
| Default group | C1 | dg |
| Tutor group | C1 | tg |
| Marker group | C1 | mg |
| Default <span class="multilang" lang="de">Gruppe</span><span class="multilang" lang="en">group</span> | C1 | dg |
| Tutor <span class="multilang" lang="de">Gruppe</span><span class="multilang" lang="en">group</span> | C1 | tg |
| Marker <span class="multilang" lang="de">Gruppe</span><span class="multilang" lang="en">group</span> | C1 | mg |
And the following "group members" exist:
| user | group |
| student1 | dg |
And the "multilang" filter is "on"
And the "multilang" filter applies to "content and headings"
And I am on the "C1" "Course" page logged in as "teacher1"
And I change window size to "large"