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

MDL-80746 gradereport_grader: fix action bar rendering

Browse source 
This code was unnecessarily pre-rendering some context properties used
by the action_menu, which also meant the mustache template expected HTML
in the context, which should be avoided. Instead of pre-rendering, just
export_for_template() and adjust the mustache template to render the sub
template for the respective templatables.
This commit is contained in:
Jake Dallimore 2024-09-11 15:02:08 +08:00 • committed by Mihail Geshoski
parent b62aff2c3a
commit cf524d0172
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
grade/report/grader/classes/output/action_bar.php
View file

@ -17,7 +17,9 @@
namespace gradereport_grader\output; namespace gradereport_grader\output;
use core\output\comboboxsearch; use core\output\comboboxsearch;
use core_course\output\actionbar\group_selector;
use core_course\output\actionbar\initials_selector; use core_course\output\actionbar\initials_selector;
use core_course\output\actionbar\user_selector;
use core_grades\output\general_action_bar; use core_grades\output\general_action_bar;
use moodle_url; use moodle_url;
@ -70,7 +72,7 @@ class action_bar extends \core_grades\output\action_bar {
* @throws \moodle_exception * @throws \moodle_exception
*/ */
public function export_for_template(\renderer_base $output): array { public function export_for_template(\renderer_base $output): array {
global $PAGE, $OUTPUT, $SESSION, $USER; global $SESSION, $USER;
// If in the course context, we should display the general navigation selector in gradebook. // If in the course context, we should display the general navigation selector in gradebook.
$courseid = $this->context->instanceid; $courseid = $this->context->instanceid;
// Get the data used to output the general navigation selector. // Get the data used to output the general navigation selector.
@ -94,7 +96,6 @@ class action_bar extends \core_grades\output\action_bar {
$additionalparams['gpr_search'] = $this->usersearch; $additionalparams['gpr_search'] = $this->usersearch;
} }
$actionbarrenderer = $PAGE->get_renderer('core_course', 'actionbar');
$initialselector = new initials_selector( $initialselector = new initials_selector(
course: $course, course: $course,
targeturl: '/grade/report/grader/index.php', targeturl: '/grade/report/grader/index.php',
@ -102,22 +103,22 @@ class action_bar extends \core_grades\output\action_bar {
lastinitial: $lastnameinitial, lastinitial: $lastnameinitial,
additionalparams: $additionalparams, additionalparams: $additionalparams,
); );
$data['initialselector'] = $actionbarrenderer->render($initialselector); $data['initialselector'] = $initialselector->export_for_template($output);
if ($course->groupmode) { if ($course->groupmode) {
$data['groupselector'] = $actionbarrenderer->render( $gs = new group_selector($this->context);
new \core_course\output\actionbar\group_selector($this->context)); $data['groupselector'] = $gs->export_for_template($output);
} }
$resetlink = new moodle_url('/grade/report/grader/index.php', ['id' => $courseid]); $resetlink = new moodle_url('/grade/report/grader/index.php', ['id' => $courseid]);
$userselectorrenderer = new \core_course\output\actionbar\user_selector( $userselector = new user_selector(
course: $course, course: $course,
resetlink: $resetlink, resetlink: $resetlink,
userid: $this->userid, userid: $this->userid,
groupid: 0, groupid: 0,
usersearch: $this->usersearch usersearch: $this->usersearch
); );
$data['searchdropdown'] = $userselectorrenderer->export_for_template($output); $data['searchdropdown'] = $userselector->export_for_template($output);
// The collapsed column dialog is aligned to the edge of the screen, we need to place it such that it also aligns. // The collapsed column dialog is aligned to the edge of the screen, we need to place it such that it also aligns.
$collapsemenudirection = right_to_left() ? 'dropdown-menu-left' : 'dropdown-menu-right'; $collapsemenudirection = right_to_left() ? 'dropdown-menu-left' : 'dropdown-menu-right';

8
grade/report/grader/templates/action_bar.mustache
View file

@ -60,7 +60,9 @@
} }
] ]
}, },
"groupselector": "<div class='group-selector'></div>", "searchdropdown": {"search dropdown": "context here"},
"groupselector": {"group selector": "context here"},
"initialselector": {"initial selector": "context here"},
"collapsedcolumns": "<div class='collapse-columns'></div>", "collapsedcolumns": "<div class='collapse-columns'></div>",
"pagereset": "http://moodle.local/grade/report/grader/index.php?id=2&userid=2&reset=1" "pagereset": "http://moodle.local/grade/report/grader/index.php?id=2&userid=2&reset=1"
} }
@ -81,13 +83,13 @@
{{/searchdropdown}} {{/searchdropdown}}
{{#groupselector}} {{#groupselector}}
<div class="navitem"> <div class="navitem">
{{{.}}} {{>core/comboboxsearch}}
</div> </div>
<div class="navitem-divider"></div> <div class="navitem-divider"></div>
{{/groupselector}} {{/groupselector}}
{{#initialselector}} {{#initialselector}}
<div class="navitem d-flex flex-column align-self-center"> <div class="navitem d-flex flex-column align-self-center">
{{{.}}} {{>core/comboboxsearch}}
</div> </div>
<div class="navitem-divider"></div> <div class="navitem-divider"></div>
{{/initialselector}} {{/initialselector}}