From da7d67f3eb32a9c40a5deef9a60a2b3c8ba4a434 Mon Sep 17 00:00:00 2001
From: Tyler Lemburg <trlemburg@gmail.com>
Date: Wed, 6 Jul 2016 16:26:48 -0500
Subject: [PATCH] bugfix on agenda
---
routes/admin/agenda.rb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/routes/admin/agenda.rb b/routes/admin/agenda.rb
index 7ced67f..4406a6a 100644
--- a/routes/admin/agenda.rb
+++ b/routes/admin/agenda.rb
@@ -8,7 +8,10 @@ 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(events: {:service_space_id => @space.id}).in_day(date).order(:start_time)
+ reservations = Reservation.includes(:user, :resource, :event).in_day(date).order(:start_time).all.to_a
+ reservations.select! do |res|
+ res.event.service_space_id == @space.id
+ end
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