From 43caf0217ff3c67175b645b82ccdf11f03bc1b65 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Thu, 2 Nov 2017 15:43:17 +0800 Subject: [PATCH] MDL-60558 block_calendar_upcoming: Render the template when no events --- blocks/calendar_upcoming/block_calendar_upcoming.php | 6 +----- calendar/templates/upcoming_mini.mustache | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/blocks/calendar_upcoming/block_calendar_upcoming.php b/blocks/calendar_upcoming/block_calendar_upcoming.php index 0d6fc79c132..e0e0267f78d 100644 --- a/blocks/calendar_upcoming/block_calendar_upcoming.php +++ b/blocks/calendar_upcoming/block_calendar_upcoming.php @@ -65,11 +65,7 @@ class block_calendar_upcoming extends block_base { list($data, $template) = calendar_get_view($calendar, 'upcoming_mini'); - if (empty($data->events)) { - $this->content->text = '
'. get_string('noupcomingevents', 'calendar').'
'; - } else { - $this->content->text .= $renderer->render_from_template($template, $data); - } + $this->content->text .= $renderer->render_from_template($template, $data); $this->content->footer = '
'. diff --git a/calendar/templates/upcoming_mini.mustache b/calendar/templates/upcoming_mini.mustache index 1be33f73968..082d5bcd922 100644 --- a/calendar/templates/upcoming_mini.mustache +++ b/calendar/templates/upcoming_mini.mustache @@ -55,6 +55,9 @@
{{/events}} + {{^events}} + {{#str}}noupcomingevents, calendar{{/str}} + {{/events}} {{#js}} require([ -- 2.43.0