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

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

Browse Source
This commit is contained in:
Ilya Tregubov 2023-05-30 12:54:24 +08:00
commit 95ec4161f5
No known key found for this signature in database
GPG Key ID: 0F58186F748E55C1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
group/index.php
View File

@ -95,7 +95,7 @@ switch ($action) {
foreach($groupmemberroles as $roleid=>$roledata) {
$shortroledata = new stdClass();
$shortroledata->name = $roledata->name;
$shortroledata->name = html_entity_decode($roledata->name, ENT_QUOTES, 'UTF-8');
$shortroledata->users = array();
foreach($roledata->users as $member) {
$shortmember = new stdClass();
@ -183,7 +183,7 @@ if ($groups) {
foreach ($groups as $group) {
$selected = false;
$usercount = $DB->count_records('groups_members', array('groupid' => $group->id));
$groupname = format_string($group->name) . ' (' . $usercount . ')';
$groupname = format_string($group->name, true, ['context' => $context, 'escape' => false]) . ' (' . $usercount . ')';
if (in_array($group->id, $groupids)) {
$selected = true;
if ($singlegroup) {
@ -234,8 +234,9 @@ if ($singlegroup) {
$users[] = $shortmember;
}
$members[] = (object)[
'role' => s($roledata->name),
'role' => html_entity_decode($roledata->name, ENT_QUOTES, 'UTF-8'),
'rolemembers' => $users
];
}

2
lib/templates/datafilter/filter_type.mustache
View File

@ -56,6 +56,6 @@
}}{{#filtertypeclass}}data-filter-type-class="{{filtertypeclass}}" {{/filtertypeclass}}{{!
}}>
{{#values}}
<option value="{{value}}">{{title}}</option>
<option value="{{value}}">{{{title}}}</option>
{{/values}}
</select>

4
user/selector/lib.php
View File

@ -763,11 +763,11 @@ abstract class groups_user_selector_base extends user_selector_base {
foreach ($roles as $role) {
if ($search) {
$a = new stdClass;
$a->role = $role->name;
$a->role = html_entity_decode($role->name, ENT_QUOTES, 'UTF-8');
$a->search = $search;
$groupname = get_string('matchingsearchandrole', '', $a);
} else {
$groupname = $role->name;
$groupname = html_entity_decode($role->name, ENT_QUOTES, 'UTF-8');
}
$groupedusers[$groupname] = $role->users;
foreach ($groupedusers[$groupname] as &$user) {