gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch mail sending to active_job

Browse source 
Before we were using the delayed_job method of delaying
mail sending which isn't working anymore on rails 4.
This commit is contained in:
Henne Vogelsang 2016-04-20 18:59:24 +02:00
parent 14011f8828
commit 21280cd9d8
9 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/cfps_controller.rb
View file

@ -31,7 +31,7 @@ module Admin
send_mail_on_cfp_dates_updates = @cfp.notify_on_cfp_date_update?
if @cfp.update_attributes(cfp_params)
Mailbot.delay.send_on_cfp_dates_updates(@conference) if send_mail_on_cfp_dates_updates
Mailbot.send_on_cfp_dates_updates(@conference).deliver_later if send_mail_on_cfp_dates_updates
redirect_to admin_conference_program_cfp_path(@conference.short_title),
notice: 'Call for papers successfully updated.'
else

2
app/controllers/admin/conference_controller.rb
View file

@ -85,7 +85,7 @@ module Admin
send_mail_on_conf_update = @conference.notify_on_dates_changed?
if @conference.update_attributes(conference_params)
Mailbot.delay.conference_date_update_mail(@conference) if send_mail_on_conf_update
Mailbot.conference_date_update_mail(@conference).deliver_later if send_mail_on_conf_update
redirect_to edit_admin_conference_path(id: @conference.short_title),
notice: 'Conference was successfully updated.'
else

2
app/controllers/admin/programs_controller.rb
View file

@ -14,7 +14,7 @@ module Admin
send_mail_on_schedule_public = @program.notify_on_schedule_public?
if @program.update_attributes(program_params)
Mailbot.delay.send_on_schedule_public(@conference) if send_mail_on_schedule_public
Mailbot.send_on_schedule_public(@conference).deliver_later if send_mail_on_schedule_public
redirect_to admin_conference_program_path(@conference.short_title),
notice: 'The program was successfully updated.'
else

4
app/controllers/admin/registration_periods_controller.rb
View file

@ -12,7 +12,7 @@ module Admin
send_mail_on_reg_update = @conference.notify_on_registration_dates_changed?
if @registration_period.save
Mailbot.delay.conference_registration_date_update_mail(@conference) if send_mail_on_reg_update
Mailbot.conference_registration_date_update_mail(@conference).deliver_later if send_mail_on_reg_update
redirect_to admin_conference_registration_period_path(@conference.short_title),
notice: 'Registration Period successfully updated.'
else
@ -32,7 +32,7 @@ module Admin
send_mail_on_reg_update = @conference.notify_on_registration_dates_changed?
if @registration_period.update(registration_period_params)
Mailbot.delay.conference_registration_date_update_mail(@conference) if send_mail_on_reg_update
Mailbot.conference_registration_date_update_mail(@conference).deliver_later if send_mail_on_reg_update
redirect_to admin_conference_registration_period_path(@conference.short_title),
notice: 'Registration Period successfully updated.'
else