Merge branch 'MDL-65310-master' of https://github.com/tsmilan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2019 22:41:22 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2019 22:41:22 +0000 (00:41 +0200)
blocks/timeline/amd/build/event_list.min.js
blocks/timeline/amd/build/event_list.min.js.map
blocks/timeline/amd/src/event_list.js

index 5989f59..22c0b2e 100644 (file)
Binary files a/blocks/timeline/amd/build/event_list.min.js and b/blocks/timeline/amd/build/event_list.min.js differ
index c65cadb..52c0abd 100644 (file)
Binary files a/blocks/timeline/amd/build/event_list.min.js.map and b/blocks/timeline/amd/build/event_list.min.js.map differ
index 9699ed1..3545cbf 100644 (file)
@@ -265,7 +265,10 @@ function(
                 return [];
             }
 
-            var calendarEvents = result.events;
+            var calendarEvents = result.events.filter(function(event) {
+                // Do not include events that does not have a due date.
+                return event.eventtype != "open" && event.eventtype != "opensubmission";
+            });
             // We expect to receive limit + 1 events back from the server.
             // Any less means there are no more events to load.
             var loadedAll = calendarEvents.length <= limit;