From d08e18037692fbe36c943682556c3ad8211471ab Mon Sep 17 00:00:00 2001
From: Tyler Lemburg <trlemburg@gmail.com>
Date: Wed, 6 Jul 2016 16:21:17 -0500
Subject: [PATCH] bugfix on agenda
---
routes/admin/agenda.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/routes/admin/agenda.rb b/routes/admin/agenda.rb
index a312eca..dad03c4 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(:service_space_id => @space.id).in_day(date).order(:start_time)
+ reservations = Reservation.includes(:user, :resource, :event).where(event: {: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
--
GitLab