moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-71846' of git://github.com/paulholden/moodle

Browse source
This commit is contained in:
Ilya Tregubov 2021-09-13 13:38:25 +02:00
commit 5fad3cd0f8
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
group/clientlib.js
View file

@ -97,7 +97,7 @@ function UpdatableMembersCombo(wwwRoot, courseId) {
var optionEl = document.createElement("option"); var optionEl = document.createElement("option");
optionEl.setAttribute("value", roles[i].users[j].id); optionEl.setAttribute("value", roles[i].users[j].id);
optionEl.title = roles[i].users[j].name; optionEl.title = roles[i].users[j].name;
optionEl.innerHTML = roles[i].users[j].name; optionEl.innerHTML = Y.Escape.html(roles[i].users[j].name);
optgroupEl.appendChild(optionEl); optgroupEl.appendChild(optionEl);
} }
selectEl.appendChild(optgroupEl); selectEl.appendChild(optgroupEl);

5
group/index.php
View file

@ -104,7 +104,8 @@ switch ($action) {
if ($extrafields) { if ($extrafields) {
$extrafieldsdisplay = []; $extrafieldsdisplay = [];
foreach ($extrafields as $field) { foreach ($extrafields as $field) {
$extrafieldsdisplay[] = s($member->{$field}); // No escaping here, handled client side in response to AJAX request.
$extrafieldsdisplay[] = $member->{$field};
} }
$shortmember->name .= ' (' . implode(', ', $extrafieldsdisplay) . ')'; $shortmember->name .= ' (' . implode(', ', $extrafieldsdisplay) . ')';
} }
@ -200,7 +201,7 @@ if ($groups) {
$groupoptions[] = (object) [ $groupoptions[] = (object) [
'value' => $group->id, 'value' => $group->id,
'selected' => $selected, 'selected' => $selected,
'text' => $groupname 'text' => s($groupname)
]; ];
} }
} }

2
group/templates/index.mustache
View file

@ -120,7 +120,7 @@
{{#members}} {{#members}}
<optgroup label="{{role}}"> <optgroup label="{{role}}">
{{#rolemembers}} {{#rolemembers}}
<option value="{{value}}">{{{text}}}‎</option> <option value="{{value}}" title="{{{text}}}">{{{text}}}‎</option>
{{/rolemembers}} {{/rolemembers}}
</optgroup> </optgroup>
{{/members}} {{/members}}