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

Big refactoring of registration

Browse source 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
This commit is contained in:
Chrisbr 2014-08-22 15:08:54 +02:00
parent 0f1051d24e
commit d21e19b977
34 changed files with 435 additions and 12988 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/proposal_controller.rb
View file

@ -45,15 +45,13 @@ class ProposalController < ApplicationController
return
end
registration = current_user.registrations.where(conference_id: @conference.id).first
ahoy.track 'Event submission', title: 'New submission'
if registration.nil?
redirect_to(conference_register_path(@conference.short_title),
alert: 'Event was successfully submitted.
You should register for the conference now.')
else
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
if @conference.user_registered?(current_user)
redirect_to(conference_proposal_index_path(@conference.short_title),
notice: 'Event was successfully submitted.')
else
redirect_to(new_conference_conference_registrations_path(conference_id: @conference.short_title),
alert: 'Event was successfully submitted. You should register for the conference now.')
end
end
@ -114,13 +112,12 @@ class ProposalController < ApplicationController
return
end
if !@conference.user_registered?(current_user)
redirect_to(conference_register_path(@conference.short_title),
alert: 'The proposal was confirmed. Please register to attend the conference.')
return
if @conference.user_registered?(current_user)
redirect_to(conference_proposal_index_path(@conference.short_title),
notice: 'The proposal was confirmed.')
end
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
notice: 'The proposal was confirmed.')
redirect_to(new_conference_conference_registrations_path(conference_id: @conference.short_title),
alert: 'The proposal was confirmed. Please register to attend the conference.')
end
def restart