gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-travel-schedule' into remove-schedule

Browse source 
* remove-travel-schedule:
  Remove travel schedule from registration
  Correct variable error
  fixes redirect loop
  add if condition to send booth rejection mail
This commit is contained in:
Michael Ball 2020-01-07 00:58:53 -08:00
commit be657c45a4
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,9 @@ module Admin
@booth.reject!
if @booth.save
Mailbot.conference_booths_rejection_mail(@booth).deliver_later
if @conference.email_settings.send_on_booths_rejection
Mailbot.conference_booths_rejection_mail(@booth).deliver_later
end
redirect_to admin_conference_booths_path(conference_id: @conference.short_title),
notice: "#{(t'booth').capitalize} successfully rejected."
else

3
app/controllers/users/omniauth_callbacks_controller.rb
View file

@ -35,8 +35,7 @@ module Users
openid.save!
sign_in user
redirect_to request.env['omniauth.origin'] || root_path,
notice: "#{user.email} signed in successfully with #{provider}"
redirect_to root_path, notice: "#{user.email} signed in successfully with #{provider}"
rescue => e
flash[:error] = e.message
redirect_back_or_to new_user_registration_path