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

Merge branch 'MDL-77057' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Andrew Nicols 2023-02-09 10:19:22 +08:00
commit 9890d88107
10 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mod/quiz/classes/form/edit_override_form.php
View file

@ -95,8 +95,9 @@ class edit_override_form extends moodleform {
// Group override.
if ($this->groupid) {
// There is already a groupid, so freeze the selector.
$groupchoices = [];
$groupchoices[$this->groupid] = groups_get_group_name($this->groupid);
$groupchoices = [
$this->groupid => format_string(groups_get_group_name($this->groupid), true, $this->context),
];
$mform->addElement('select', 'groupid',
get_string('overridegroup', 'quiz'), $groupchoices);
$mform->freeze('groupid');
@ -112,7 +113,7 @@ class edit_override_form extends moodleform {
$groupchoices = [];
foreach ($groups as $group) {
$groupchoices[$group->id] = $group->name;
$groupchoices[$group->id] = format_string($group->name, true, $this->context);
}
unset($groups);

2
mod/quiz/overridedelete.php
View file

@ -97,7 +97,7 @@ echo $OUTPUT->header();
if ($override->groupid) {
$group = $DB->get_record('groups', ['id' => $override->groupid], 'id, name');
$confirmstr = get_string("overridedeletegroupsure", "quiz", $group->name);
$confirmstr = get_string("overridedeletegroupsure", "quiz", format_string($group->name, true, ['context' => $context]));
} else {
$user = $DB->get_record('user', ['id' => $override->userid]);
profile_load_custom_fields($user);

2
mod/quiz/overrides.php
View file

@ -233,7 +233,7 @@ foreach ($overrides as $override) {
$groupcell = new html_table_cell();
$groupcell->rowspan = count($fields);
$groupcell->text = html_writer::link(new moodle_url($groupurl, ['group' => $override->groupid]),
$override->name . $extranamebit);
format_string($override->name, true, ['context' => $context]) . $extranamebit);
$usercells[] = $groupcell;
} else {
$usercell = new html_table_cell();