Commit 5791be8a authored by Antoine GIRARD's avatar Antoine GIRARD

Hotfix fullcalendar

parent 5b717d3b
......@@ -35,8 +35,9 @@ class ContentsController < ApplicationController
end
def fullcalendar
@content = Content.filter_all_content(params)
@content = Kaminari.paginate_array(@content).page(params[:page])
start_time = DateTime.parse(params[:start_time])
end_time = DateTime.parse(params[:end_time])
@content = Content.where('start_time < ? AND end_time > ?', end_time, start_time)
end
# GET /contents/1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment