From 47c9b1b1d0bb22d11f50898db4d7328a45dc02a0 Mon Sep 17 00:00:00 2001 From: Ana Date: Thu, 18 Aug 2016 14:02:08 +0200 Subject: [PATCH] Show all events instead of the schedule Show all events instead od the schedule if there are less than 2 rooms. --- app/controllers/schedules_controller.rb | 4 +++- app/views/schedules/events.html.haml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb index 91559aa1..edb73123 100644 --- a/app/controllers/schedules_controller.rb +++ b/app/controllers/schedules_controller.rb @@ -7,7 +7,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 diff --git a/app/views/schedules/events.html.haml b/app/views/schedules/events.html.haml index 24092ec2..4fbf31f8 100644 --- a/app/views/schedules/events.html.haml +++ b/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