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

Another fix for emails

Browse Source
This commit is contained in:
Godwin 2017-05-23 15:50:35 -07:00
parent 23e839bedf
commit 9e613e0b69
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/workshops_controller.rb
View File

@ -217,7 +217,7 @@ class WorkshopsController < ApplicationController
# create the request by making the user a facilitator but making their role 'requested' # create the request by making the user a facilitator but making their role 'requested'
WorkshopFacilitator.create(user_id: current_user.id, workshop_id: workshop.id, role: :requested) WorkshopFacilitator.create(user_id: current_user.id, workshop_id: workshop.id, role: :requested)
UserMailer.send_mail(:workshop_facilitator_request, workshop.id, current_user.id, params[:message]) send_mail(:workshop_facilitator_request, workshop.id, current_user.id, params[:message])
redirect_to sent_facilitate_workshop_url(@this_conference.slug, workshop.id) redirect_to sent_facilitate_workshop_url(@this_conference.slug, workshop.id)
end end
@ -251,7 +251,7 @@ class WorkshopsController < ApplicationController
f.role = :collaborator f.role = :collaborator
f.save f.save
LinguaFranca.with_locale(user.locale) do LinguaFranca.with_locale(user.locale) do
UserMailer.send_mail(:workshop_facilitator_request_approved, workshop.id, user.id) send_mail(:workshop_facilitator_request_approved, workshop.id, user.id)
end end
return redirect_to view_workshop_url(@this_conference.slug, workshop.id) return redirect_to view_workshop_url(@this_conference.slug, workshop.id)
end end
@ -261,7 +261,7 @@ class WorkshopsController < ApplicationController
:workshop_id => workshop.id, :workshop_id => workshop.id,
:user_id => user_id) :user_id => user_id)
LinguaFranca.with_locale user.locale do LinguaFranca.with_locale user.locale do
UserMailer.send_mail(:workshop_facilitator_request_denied, workshop.id, user.id) send_mail(:workshop_facilitator_request_denied, workshop.id, user.id)
end end
return redirect_to view_workshop_url(@this_conference.slug, workshop.id) return redirect_to view_workshop_url(@this_conference.slug, workshop.id)
end end
@ -309,7 +309,7 @@ class WorkshopsController < ApplicationController
WorkshopFacilitator.create(user_id: user.id, workshop_id: workshop.id, role: :collaborator) WorkshopFacilitator.create(user_id: user.id, workshop_id: workshop.id, role: :collaborator)
LinguaFranca.with_locale user.locale do LinguaFranca.with_locale user.locale do
UserMailer.send_mail(:workshop_facilitator_request_approved, workshop.id, user.id) send_mail(:workshop_facilitator_request_approved, workshop.id, user.id)
end end
end end
@ -329,7 +329,7 @@ class WorkshopsController < ApplicationController
unless comment.user.id == current_user.id unless comment.user.id == current_user.id
LinguaFranca.with_locale comment.user.locale do LinguaFranca.with_locale comment.user.locale do
UserMailer.send_mail(:workshop_comment, workshop.id, new_comment.id, comment.user.id) send_mail(:workshop_comment, workshop.id, new_comment.id, comment.user.id)
end end
end end
elsif params[:button] = 'add_comment' elsif params[:button] = 'add_comment'
@ -338,7 +338,7 @@ class WorkshopsController < ApplicationController
workshop.active_facilitators.each do | u | workshop.active_facilitators.each do | u |
unless u.id == current_user.id unless u.id == current_user.id
LinguaFranca.with_locale u.locale do LinguaFranca.with_locale u.locale do
UserMailer.send_mail(:workshop_comment, workshop.id, new_comment.id, u.id) send_mail(:workshop_comment, workshop.id, new_comment.id, u.id)
end end
end end
end end

8
app/mailers/user_mailer.rb
View File

@ -167,14 +167,6 @@ class UserMailer < ActionMailer::Base
mail to: 'goodgodwin@hotmail.com', subject: @subject mail to: 'goodgodwin@hotmail.com', subject: @subject
end end
def self.send_mail(*args)
if Rails.env.preview? || Rails.env.production?
delay(queue: Rails.env.to_s).send(*args)
else
send(*args).deliver_now
end
end
private private
def set_host(*args) def set_host(*args)
if Rails.env.production? if Rails.env.production?