filter agenda on service space

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)