From 36c4bd4faf1dbd7cec670a2df5e90ed0efb5b8a8 Mon Sep 17 00:00:00 2001
From: Tyler Lemburg <trlemburg@gmail.com>
Date: Wed, 6 Jul 2016 16:17:00 -0500
Subject: [PATCH] filter agenda on service space
---
routes/admin/agenda.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/routes/admin/agenda.rb b/routes/admin/agenda.rb
index fcd3a3a..a312eca 100644
--- a/routes/admin/agenda.rb
+++ b/routes/admin/agenda.rb
@@ -8,8 +8,8 @@ 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).in_day(date).order(:start_time)
- events = Event.includes(:event_type).in_day(date).order(:start_time)
+ reservations = Reservation.includes(:user, :resource, :event).where(: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
hours = SpaceHour.where(:service_space_id => @space.id)
--
GitLab