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

Merge branch 'master' of https://github.com/openSUSE/osem into feature_tests2

Browse source
This commit is contained in:
Chrisbr 2014-05-13 15:53:38 +02:00
commit 53bc0a7dac
3 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/conference_registration_controller.rb
View file

@ -74,7 +74,9 @@ class ConferenceRegistrationController < ApplicationController
if update_registration
redirect_message = "Registration updated."
else
Mailbot.registration_mail(conference, current_user.person).deliver
if conference.email_settings.send_on_registration?
Mailbot.registration_mail(conference, current_user.person).deliver
end
end
redirect_to(register_conference_path(:id => conference.short_title), :notice => redirect_message)
end