From b54b098a1993933a22720ec88b2fd708b02dbb64 Mon Sep 17 00:00:00 2001
From: Ancor Gonzalez Sosa <ancor@suse.de>
Date: Thu, 11 Jul 2013 13:49:50 +0200
Subject: [PATCH] Fixing the json generated by admin/conference/x/events

---
 app/controllers/admin/events_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index 46a2931c..4ba56cfc 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -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