Fix calendar ransack filter

Refs #3173

1 files changed, 13 insertions, 1 deletions

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 3e7a05231..c33aa9373 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,7 +1,7 @@
 class CalendarsController < BreadcrumbController
   include PolicyChecker
   defaults resource_class: Calendar
-
+  before_action :ransack_contains_date, only: [:index]
   respond_to :html
   respond_to :js, only: :index
 
@@ -39,5 +39,17 @@ class CalendarsController < BreadcrumbController
     calendars = calendars.order(sort_column + ' ' + sort_direction) if sort_column && sort_direction
     @calendars = calendars.paginate(page: params[:page])
   end
+
+  def ransack_contains_date
+    # 3 parts to date object, in order to use in ransackable_scopes
+    if params[:q] && !params[:q]['contains_date(1i)'].empty?
+      date =[]
+      ['contains_date(1i)', 'contains_date(2i)', 'contains_date(3i)'].each do |key|
+        date << params[:q][key]
+        params[:q].delete(key)
+      end
+      params[:q]['contains_date'] = Date.parse(date.join('-'))
+    end
+  end
 end