From 3b8c91bbd90bb2bb1e57554431d5718349310829 Mon Sep 17 00:00:00 2001
From: Stella Rouzi <differentreality@gmail.com>
Date: Mon, 20 Apr 2015 13:17:47 +0300
Subject: [PATCH] fix scrolling of left column in schedule, show only
 @conference.events

---
 app/controllers/admin/events_controller.rb | 2 +-
 public/stylesheets/schedule/schedule.css   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index 298b5cd7..019d0116 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -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
 
diff --git a/public/stylesheets/schedule/schedule.css b/public/stylesheets/schedule/schedule.css
index 0bdf89d2..2cfd3bed 100644
--- a/public/stylesheets/schedule/schedule.css
+++ b/public/stylesheets/schedule/schedule.css
@@ -89,8 +89,8 @@ li ul li a:hover {
     width:200px;
     bottom:50px;
     position:absolute;
-    overflow-x: hidden;
-    overflow-y: hidden;
+    overflow-x: auto;
+    overflow-y: auto;
 }
 
 .tab-content {