Move Conference contact details to Contact
This commit is contained in:
parent
eb3e6898d2
commit
5aa0d58c57
18 changed files with 67 additions and 58 deletions
|
|
@ -26,6 +26,7 @@ class Admin::ContactsController < ApplicationController
|
|||
end
|
||||
|
||||
private
|
||||
|
||||
# Use callbacks to share common setup or constraints between actions.
|
||||
def set_contact
|
||||
@contact = @conference.contact
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class ConferenceRegistrationController < ApplicationController
|
|||
if regs.where(email: user.email).count == 0
|
||||
redirect_to(register_conference_path(id: conference.short_title),
|
||||
alert: "This code is already in use.
|
||||
Please contact #{conference.contact_email} for assistance.")
|
||||
Please contact #{conference.contact.email} for assistance.")
|
||||
return
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue