Commit e3491a09 authored by Andrew Nicols's avatar Andrew Nicols
Browse files

MDL-60558 calendar: Upcoming block should use the right template

parent a0a78199
......@@ -78,5 +78,3 @@ class block_calendar_upcoming extends block_base {
return $this->content;
......@@ -3220,7 +3220,7 @@ function calendar_get_view(\calendar_information $calendar, $view, $includenavig
if ($view == "upcoming") {
$template = 'core_calendar/calendar_upcoming';
} else if ($view == "upcoming_mini") {
$template = 'core_calendar/upcoming_mini';
$template = 'core_calendar/calendar_upcoming_mini';
This file is part of Moodle -
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <>.
@template core_calendar/calendar_upcoming_block
Calendar upcoming view.
The purpose of this template is to render the calendar upcoming view.
Classes required for JS:
* none
Data attributes required for JS:
* none
Example context (json):
<div id="calendar-upcoming-block-{{uniqid}}" data-template="core_calendar/upcoming_mini">
{{> core_calendar/upcoming_mini}}
require(['jquery', 'core_calendar/calendar_view'], function($, CalendarView) {
CalendarView.init($("#calendar-upcoming-block-{{uniqid}}"), 'upcoming');
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment