gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16 from ancorgs/master

Browse source 
Fixing the json generated by admin/conference/x/events
This commit is contained in:
Henne Vogelsang 2013-07-11 05:32:28 -07:00
commit 7e43a00098
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,8 @@ class Admin::EventsController < ApplicationController
@event_states = @events.state_machine.states.map
respond_to do |format|
format.html
format.json { render :json => Event.where(:state => :confirmed) }
# Explicity call #to_json to avoid the use of EventSerializer
format.json { render :json => Event.where(:state => :confirmed).to_json }
end
end