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

Merge pull request #643 from differentreality/events_json

Browse source 
fix scrolling of left column in schedule, show only @conference.events
This commit is contained in:
Stella Rouzi 2015-04-20 18:26:25 +03:00
commit 6eef0c1ca7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ module Admin
respond_to do |format|
format.html
# Explicity call #to_json to avoid the use of EventSerializer
format.json { render json: Event.where(state: :confirmed).to_json }
format.json { render json: Event.where(state: :confirmed, conference: @conference).to_json }
end
end