MDL-60058 calendar: fix event context issue in month_detailed

moodle · Oct 13, 2017 · a4f9494 · a4f9494
1 parent 8c4b939
commit a4f9494
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/calendar/classes/external/day_exporter.php b/calendar/classes/external/day_exporter.php
@@ -130,6 +130,10 @@ protected static function define_other_properties() {
                 'type' => calendar_event_exporter::read_properties_definition(),
                 'multiple' => true,
             ],
+            'hasevents' => [
+                'type' => PARAM_BOOL,
+                'default' => false,
+            ],
             'calendareventtypes' => [
                 'type' => PARAM_RAW,
                 'multiple' => true,
@@ -211,6 +215,8 @@ protected function get_other_values(renderer_base $output) {
             return $exporter->export($output);
         }, $eventexporters);
 
+        $return['hasevents'] = !empty($return['events']);
+
         $return['calendareventtypes'] = array_map(function($exporter) {
             return $exporter->get_calendar_event_type();
         }, $eventexporters);

diff --git a/calendar/templates/month_detailed.mustache b/calendar/templates/month_detailed.mustache
@@ -71,13 +71,13 @@
                         data-region="day"
                         data-new-event-timestamp="{{neweventtimestamp}}">
                         <div class="hidden-sm-down text-xs-center">
-                            {{#events.0}}
+                            {{#hasevents}}
                                 <a data-action="view-day-link" href="{{viewdaylink}}" class="day" title="{{viewdaylinktitle}}">{{mday}}</a>
-                            {{/events.0}}
-                            {{^events.0}}
+                            {{/hasevents}}
+                            {{^hasevents}}
                                 {{mday}}
-                            {{/events.0}}
-                            {{#events.0}}
+                            {{/hasevents}}
+                            {{#hasevents}}
                                 <div data-region="day-content">
                                     <ul>
                                         {{#events}}
@@ -111,17 +111,17 @@
                                         {{/events}}
                                     </ul>
                                 </div>
-                            {{/events.0}}
+                            {{/hasevents}}
                         </div>
                         <div class="hidden-md-up hidden-desktop">
-                            {{#events.0}}
+                            {{#hasevents}}
                                 <a href="{{viewdaylink}}" class="day" title="{{viewdaylinktitle}}">{{mday}}</a>
-                            {{/events.0}}
-                            {{^events.0}}
+                            {{/hasevents}}
+                            {{^hasevents}}
                                 <div data-region="day-content">
                                     {{mday}}
                                 </div>
-                            {{/events.0}}
+                            {{/hasevents}}
                         </div>
                     </td>
                 {{/days}}