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

updated rails to 4.2.4

Browse source
This commit is contained in:
raluka 2015-09-17 12:12:51 +02:00
parent 37697517df
commit 42e8bb11ea
55 changed files with 766 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/events_controller.rb
View file

@ -179,12 +179,12 @@ module Admin
def update_state(transition, notice, mail = false, subject = false, send_mail = false)
alert = @event.update_state(transition, mail, subject, send_mail, params[:send_mail].blank?)
if !alert.blank?
flash[:error] = error
return redirect_back_or_to(admin_conference_events_path(conference_id: @conference.short_title)) && return
else
if alert.blank?
flash[:notice] = notice
redirect_back_or_to(admin_conference_events_path(conference_id: @conference.short_title)) && return
else
flash[:error] = alert
return redirect_back_or_to(admin_conference_events_path(conference_id: @conference.short_title)) && return
end
end
end