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

Merge 24c0af7d3f into d9d72eae07

Browse source
This commit is contained in:
Christian Bruckmayer 2014-07-23 09:14:20 +00:00
commit fbbed4ffee
9 changed files with 210 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/proposal_controller.rb
View file

@ -162,7 +162,7 @@ class ProposalController < ApplicationController
if @event.transition_possible? :confirm
begin
@event.confirm!
rescue InvalidTransition => e
rescue Transitions::InvalidTransition => e
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
alert: "Event was NOT confirmed: #{e.message}")
return
@ -186,7 +186,7 @@ class ProposalController < ApplicationController
begin
@event.restart
@event.save
rescue InvalidTransition => e
rescue Transitions::InvalidTransition => e
redirect_to(conference_proposal_index_path(conference_id: @conference.short_title),
alert: "Event was NOT restarted: #{e.message}")
return