Skip to content
Snippets Groups Projects
Commit 2aa4932f authored by Tyler Lemburg's avatar Tyler Lemburg
Browse files

bugfix on agenda

parent da7d67f3
No related branches found
No related tags found
No related merge requests found
......@@ -10,7 +10,7 @@ get '/:service_space_url_name/admin/agenda/' do
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
(!res.event.nil? && res.event.service_space_id == @space.id) || (!res.resource.nil? && res.resource.service_space_id == @space.id)
end
events = Event.includes(:event_type).where(:service_space_id => @space.id).in_day(date).order(:start_time)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment