Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Add the end time of the recurring meeting to the timezone generator

Klaus Zanders58a512f1d3db
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index 0cd59c5f6c9..f1dc2c8790b 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -108,6 +108,9 @@ module Meetings
add_attendees(event: e, meeting: recurring_meeting.template)
+ # Add all occurence dates to the dates set, so that we bake in all timezone rules correcly
+ all_times.push(recurring_meeting.schedule.all_occurrences.max)
+
# Add exceptions for all cancelled recurrences
set_excluded_recurrence_dates(event: e, recurring_meeting: recurring_meeting)
end