diff --git a/routes/admin/agenda.rb b/routes/admin/agenda.rb index dad03c49d892b3900d3b912a9fed71a66c914d51..7ced67f6641bdb701b41e440ed49380bdb870ff9 100644 --- a/routes/admin/agenda.rb +++ b/routes/admin/agenda.rb @@ -8,7 +8,7 @@ get '/:service_space_url_name/admin/agenda/' do @breadcrumbs << {:text => 'Agenda'} date = params[:date].nil? ? Time.now.midnight : Time.parse(params[:date]) - reservations = Reservation.includes(:user, :resource, :event).where(event: {:service_space_id => @space.id}).in_day(date).order(:start_time) + reservations = Reservation.includes(:user, :resource, :event).where(events: {:service_space_id => @space.id}).in_day(date).order(:start_time) events = Event.includes(:event_type).where(:service_space_id => @space.id).in_day(date).order(:start_time) # get the hours for this day to show