bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed mailer

Browse Source
This commit is contained in:
Godwin 2016-07-02 13:09:48 -07:00
parent ad4d366b71
commit e5123a18e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -138,7 +138,7 @@ class ApplicationController < LinguaFrancaApplicationController
request, request,
params, params,
current_user, current_user,
).deliver_now if Rails.env.preview? || Rails.env.production? ).deliver_now! if Rails.env.preview? || Rails.env.production?
end end
render json: {} render json: {}
end end
@ -193,7 +193,7 @@ class ApplicationController < LinguaFrancaApplicationController
request, request,
params, params,
current_user, current_user,
).deliver_now if Rails.env.preview? || Rails.env.production? ).deliver_now! if Rails.env.preview? || Rails.env.production?
end end
# raise the error if we are in development so that we can debug it # raise the error if we are in development so that we can debug it
@ -343,7 +343,7 @@ class ApplicationController < LinguaFrancaApplicationController
request, request,
params, params,
current_user, current_user,
).deliver_now if Rails.env.preview? || Rails.env.production? ).deliver_now! if Rails.env.preview? || Rails.env.production?
logger.info "Missing translation found for: #{key}" logger.info "Missing translation found for: #{key}"
end end
end end

4
app/controllers/conferences_controller.rb
View File

@ -392,7 +392,7 @@ class ConferencesController < ApplicationController
@subject, @subject,
@content, @content,
current_user, current_user,
@this_conference).deliver_now @this_conference).deliver_now!
elsif params[:button] == 'preview' elsif params[:button] == 'preview'
@email_sent = :preview @email_sent = :preview
elsif params[:button] == 'send' elsif params[:button] == 'send'
@ -1006,7 +1006,7 @@ class ConferencesController < ApplicationController
@subject, @subject,
@body, @body,
current_user, current_user,
@this_conference).deliver_now @this_conference).deliver_now!
end end
return render 'conferences/register' return render 'conferences/register'
when 'locations' when 'locations'