From 0baf58f3fdec035605ace1146e9eb0cc3e328f39 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Tue, 28 Jun 2022 08:01:28 -0500 Subject: [PATCH 1/2] fix regression calendar.maximumEntries not used --- modules/default/calendar/calendarutils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/default/calendar/calendarutils.js b/modules/default/calendar/calendarutils.js index 58e05d64..547b236e 100644 --- a/modules/default/calendar/calendarutils.js +++ b/modules/default/calendar/calendarutils.js @@ -498,7 +498,8 @@ const CalendarUtils = { return a.startDate - b.startDate; }); - return newEvents; + let maxEvents=newEvents.slice(0,config.maximumEntries) + return maxEvents; }, /** From 1f4ac82495a5001a50d91a7e0e64f5964469e459 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Tue, 28 Jun 2022 08:05:13 -0500 Subject: [PATCH 2/2] add changelog for #2868 --- CHANGELOG.md | 1 + modules/default/calendar/calendarutils.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17abd728..da8adbef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ Special thanks to the following contributors: @10bias, @CFenner, @JHWelch, @k1rd - Don't adjust startDate for full day events if endDate is in the past. - Fix windspeed conversion error in openweathermap provider. (#2812) - Fix conflicting parms turning off showEnd for full day events. (#2629) +- Fix regression, calendar.maximumEntries not used to filter calendar level entries (#2868) ## [2.18.0] - 2022-01-01 diff --git a/modules/default/calendar/calendarutils.js b/modules/default/calendar/calendarutils.js index 547b236e..a70d8b3c 100644 --- a/modules/default/calendar/calendarutils.js +++ b/modules/default/calendar/calendarutils.js @@ -498,7 +498,7 @@ const CalendarUtils = { return a.startDate - b.startDate; }); - let maxEvents=newEvents.slice(0,config.maximumEntries) + let maxEvents = newEvents.slice(0, config.maximumEntries); return maxEvents; },