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

MDL-71817 calendar: Fix duplicate IDs for multiple calendar blocks

Browse source 
Done by:
* Designating instance IDs for each month_exporter instances and
assigning these instance IDs in templates.
* Adding the instance ID as an optional parameter for the
core_calendar_renderer::course_filter_selector() to generate
course filters with unique element IDs.
This commit is contained in:
Jun Pataleta 2021-07-20 01:52:25 +08:00 • committed by Simey Lameze
parent f0897dce80
commit 73a14b1075
5 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
calendar/renderer.php
View file

@ -243,9 +243,10 @@ class core_calendar_renderer extends plugin_renderer_base {
* @param moodle_url $returnurl The URL that the user should be taken too upon selecting a course.
* @param string $label The label to use for the course select.
* @param int $courseid The id of the course to be selected.
* @param int|null $calendarinstanceid The instance ID of the calendar we're generating this course filter for.
* @return string
*/
public function course_filter_selector(moodle_url $returnurl, $label = null, $courseid = null) {
public function course_filter_selector(moodle_url $returnurl, $label = null, $courseid = null, int $calendarinstanceid = null) {
global $CFG, $DB;
if (!isloggedin() or isguestuser()) {
@ -301,9 +302,13 @@ class core_calendar_renderer extends plugin_renderer_base {
$labelattributes['class'] = 'sr-only';
}
$select = html_writer::label($label, 'course', false, $labelattributes);
$filterid = 'calendar-course-filter';
if ($calendarinstanceid) {
$filterid .= "-$calendarinstanceid";
}
$select = html_writer::label($label, $filterid, false, $labelattributes);
$select .= html_writer::select($courseoptions, 'course', $selected, false,
['class' => 'cal_courses_flt ml-1 mr-auto', 'id' => 'course']);
['class' => 'cal_courses_flt ml-1 mr-auto', 'id' => $filterid]);
return $select;
}