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

Fix service for using with cache

Klaus Zanders0f42ab403200
diff --git a/modules/meeting/app/services/meetings/icalendar_builder.rb b/modules/meeting/app/services/meetings/icalendar_builder.rb
index 5184e3c77e4..54e7afc152c 100644
--- a/modules/meeting/app/services/meetings/icalendar_builder.rb
+++ b/modules/meeting/app/services/meetings/icalendar_builder.rb
@@ -146,7 +146,7 @@ module Meetings
.not_cancelled
.instantiated
.includes(meeting: [:project], recurring_meeting: [:project])
- .index_by(&:recurring_meeting_id)
+ .group_by(&:recurring_meeting_id)
@series_cache_loaded = true
end
@@ -208,7 +208,7 @@ module Meetings
# Methods for recurring meetings
def add_instantiated_occurrences(recurring_meeting:)
- upcoming_instantiated_schedules(recurring_meeting).find_each do |scheduled_meeting|
+ upcoming_instantiated_schedules(recurring_meeting).each do |scheduled_meeting|
add_single_recurring_occurrence(scheduled_meeting:)
end
end