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

Send email invites on meeting creation always

Mir Bhatia5dc02169890f
diff --git a/modules/meeting/app/controllers/meetings_controller.rb b/modules/meeting/app/controllers/meetings_controller.rb
index 320c965e0e4..dc44342dd65 100644
--- a/modules/meeting/app/controllers/meetings_controller.rb
+++ b/modules/meeting/app/controllers/meetings_controller.rb
@@ -453,7 +453,7 @@ class MeetingsController < ApplicationController
@converted_params[:project] = @project if @project.present?
@converted_params[:duration] = @converted_params[:duration].to_hours if @converted_params[:duration].present?
- @converted_params[:send_notifications] = meeting_params[:notify] == "1" && params[:meeting][:copied_from_meeting_id].present?
+ @converted_params[:send_notifications] = meeting_params[:notify] == "1"
# Handle participants separately for each meeting type
@converted_params[:participants_attributes] ||= {}
diff --git a/modules/meeting/spec/features/meeting_notifications_spec.rb b/modules/meeting/spec/features/meeting_notifications_spec.rb
index 50066ffa499..8589aac79e8 100644
--- a/modules/meeting/spec/features/meeting_notifications_spec.rb
+++ b/modules/meeting/spec/features/meeting_notifications_spec.rb
@@ -92,9 +92,10 @@ RSpec.describe "Meeting notifications", :js do
# check if notify is set correct
expect(meeting.notify).to be true
- # do not send initial mail
+ # send initial mail to meeting creator
perform_enqueued_jobs
- expect(ActionMailer::Base.deliveries.size).to eq 0
+ expect(ActionMailer::Base.deliveries.size).to eq 1
+ ActionMailer::Base.deliveries.clear
show_page.visit!
diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb
index f11cc22c57b..0418edb829f 100644
--- a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb
@@ -305,9 +305,9 @@ RSpec.describe "Meetings CRUD",
wait_for_network_idle
- # check for email notification for the added participant
+ # check for email notifications for creator & added participant
perform_enqueued_jobs
- expect(ActionMailer::Base.deliveries.size).to eq 1
+ expect(ActionMailer::Base.deliveries.size).to eq 2
ActionMailer::Base.deliveries.clear
retry_block do