Merge 47c9b1b1d0 into be33f345a1

app/controllers/schedules_controller.rb

@@ -8,7 +8,7 @@ class SchedulesController < ApplicationController
   def show
     @rooms = @conference.venue.rooms if @conference.venue
     schedules = @program.selected_event_schedules
-    unless schedules
+    unless schedules && @rooms && @rooms.length > 1
       redirect_to events_conference_schedule_path(@conference.short_title)
     end
 
@@ -29,6 +29,8 @@ class SchedulesController < ApplicationController
   def events
     @dates = @conference.start_date..@conference.end_date
 
+    @several_rooms = @conference.venue.try(:rooms) && @conference.venue.rooms.length > 1
+
     @events_schedules = @program.selected_event_schedules
     @events_schedules = [] unless @events_schedules
 

app/views/schedules/events.html.haml

@@ -1,5 +1,5 @@
 .container#program
-  -if @events_schedules.any?
+  -if @events_schedules.any? && @several_rooms
     = render partial: 'schedule_tabs',  locals: { active: 'program' }
 
   %h1.text-center