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

Merge branch 'master' into fix_user_already_subscribed_exception

Browse source
This commit is contained in:
Stella Rouzi 2017-07-23 02:46:51 +03:00 • committed by GitHub
commit 4160ac3c4e
9 changed files with 257 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/booth.rb
View file

@ -55,7 +55,7 @@ class Booth < ActiveRecord::Base
transitions to: :rejected, from: [:new, :to_reject]
end
event :cancel do
transitions to: :canceled, from: [:accepted, :rejected]
transitions to: :canceled, from: [:accepted, :rejected, :to_accept, :to_reject]
end
end