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

Merge pull request #492 from hennevogel/master

Browse source 
Fix a double render while confirming proposals
This commit is contained in:
Henne Vogelsang 2014-09-01 18:43:54 +02:00
commit a1ed852287
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/proposal_controller.rb
View file

@ -115,10 +115,11 @@ class ProposalController < ApplicationController
if @conference.user_registered?(current_user) if @conference.user_registered?(current_user)
redirect_to(conference_proposal_index_path(@conference.short_title), redirect_to(conference_proposal_index_path(@conference.short_title),
notice: 'The proposal was confirmed.') notice: 'The proposal was confirmed.')
end else
redirect_to(new_conference_conference_registrations_path(conference_id: @conference.short_title), redirect_to(new_conference_conference_registrations_path(conference_id: @conference.short_title),
alert: 'The proposal was confirmed. Please register to attend the conference.') alert: 'The proposal was confirmed. Please register to attend the conference.')
end end
end
def restart def restart
authorize! :update, @event authorize! :update, @event