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

rebase fixes

Browse source
This commit is contained in:
Stella Rouzi 2014-07-27 08:53:12 +03:00
parent 723c6aaafc
commit cb0e82c88f
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/conference_controller.rb
View file

@ -92,6 +92,7 @@ module Admin
@conference.email_settings.updated_conference_registration_dates_template @conference.email_settings.updated_conference_registration_dates_template
Mailbot.conference_registration_date_update_mail(@conference).deliver Mailbot.conference_registration_date_update_mail(@conference).deliver
end end
end
if @conference.update_attributes(params[:conference]) if @conference.update_attributes(params[:conference])
redirect_to(edit_admin_conference_path(id: @conference.short_title), redirect_to(edit_admin_conference_path(id: @conference.short_title),
@ -102,7 +103,6 @@ module Admin
"#{@conference.errors.full_messages.join('. ')}.") "#{@conference.errors.full_messages.join('. ')}.")
end end
end end
end
def show def show
@conference = Conference.find_by(short_title: params[:id]) @conference = Conference.find_by(short_title: params[:id])

2
app/controllers/proposal_controller.rb
View file

@ -56,7 +56,7 @@ class ProposalController < ApplicationController
registration = current_user.registrations.where(conference_id: @conference.id).first registration = current_user.registrations.where(conference_id: @conference.id).first
ahoy.track 'Event submission', title: 'New submission' ahoy.track 'Event submission', title: 'New submission'
if registration.nil? if registration.nil?
redirect_to(register_conference_path(@conference.short_title), redirect_to(conference_register_path(@conference.short_title),
alert: 'Event was successfully submitted. alert: 'Event was successfully submitted.
You should register for the conference now.') You should register for the conference now.')
else else