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

bugfix on agenda

parent d08e1803
Branches
Tags
No related merge requests found
Pipeline #
...@@ -8,7 +8,7 @@ get '/:service_space_url_name/admin/agenda/' do ...@@ -8,7 +8,7 @@ get '/:service_space_url_name/admin/agenda/' do
@breadcrumbs << {:text => 'Agenda'} @breadcrumbs << {:text => 'Agenda'}
date = params[:date].nil? ? Time.now.midnight : Time.parse(params[:date]) date = params[:date].nil? ? Time.now.midnight : Time.parse(params[:date])
reservations = Reservation.includes(:user, :resource, :event).where(event: {:service_space_id => @space.id}).in_day(date).order(:start_time) reservations = Reservation.includes(:user, :resource, :event).where(events: {: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) 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 # get the hours for this day to show
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment